[open-ils-commits] [GIT] Evergreen ILS branch master updated. fb8e8a4fa3d4a9aea835b8bbb09026c78d233033

Evergreen Git git at git.evergreen-ils.org
Thu Aug 1 11:15:40 EDT 2019


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  fb8e8a4fa3d4a9aea835b8bbb09026c78d233033 (commit)
      from  133b247f102868ce7e82b169d84f93323c8c3714 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fb8e8a4fa3d4a9aea835b8bbb09026c78d233033
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Thu Aug 1 11:13:14 2019 -0400

    LP#1831788: (follow-up) address ng xi18n complaint about nested i18n elements
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html
index 742cdca481..41ffcd74a7 100644
--- a/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html
@@ -258,7 +258,7 @@
     </div>
     <div *ngSwitchDefault>I don't know how to filter {{col.name}} - {{col.datatype}}</div>
   </div>
-  <span *ngIf="col.datatype !== 'org_unit'" i18n class="eg-grid-filter-operator">Operator:
+  <span *ngIf="col.datatype !== 'org_unit'" class="eg-grid-filter-operator"><ng-container i18n>Operator:</ng-container>
     <span [ngSwitch]="col.filterOperator">
       <span *ngSwitchCase="'='" i18n>Is exactly</span>
       <span *ngSwitchCase="'!='" i18n>Is not</span>
@@ -275,7 +275,7 @@
       <span *ngSwitchCase="'between'" i18n>Between</span>
     </span>
   </span>
-  <span *ngIf="col.datatype == 'org_unit'" i18n class="eg-grid-filter-operator">Operator:
+  <span *ngIf="col.datatype == 'org_unit'" class="eg-grid-filter-operator"><ng-container i18n>Operator:</ng-container>
     <span [ngSwitch]="col.filterOperator">
       <span *ngSwitchCase="'='" i18n>Is (or includes)</span>
       <span *ngSwitchCase="'!='" i18n>Is not (or excludes)</span>

-----------------------------------------------------------------------

Summary of changes:
 .../src/eg2/src/app/share/grid/grid-filter-control.component.html     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list