Fix language for region picker directives (geonetwork#7495)

GeoCat · Nov 30, 2023 · de2ae74 · de2ae74
1 parent d77409e
commit de2ae74
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/web-ui/src/main/resources/catalog/components/common/map/partials/drawbbox.html b/web-ui/src/main/resources/catalog/components/common/map/partials/drawbbox.html
@@ -3,7 +3,7 @@
     <!--Region picker-->
     <label class="col-sm-3 control-label" data-translate="">chooseRegion</label>
     <div class="col-md-8">
-      <div data-gn-region-picker=""></div>
+      <div data-gn-region-picker="" data-lang="{{lang}}"></div>
     </div>
   </div>
 

diff --git a/web-ui/src/main/resources/catalog/components/utility/UtilityDirective.js b/web-ui/src/main/resources/catalog/components/utility/UtilityDirective.js
@@ -482,6 +482,8 @@
           var addGeonames = !attrs["disableGeonames"];
           scope.regionTypes = [];
 
+          scope.lang = attrs["lang"];
+
           function setDefault() {
             var defaultThesaurus = attrs["default"];
             for (var t in scope.regionTypes) {
@@ -736,6 +738,8 @@
               }
             });
           }
+          scope.lang = attrs["lang"];
+
           scope.$watch("regionType", function (val) {
             if (scope.regionType) {
               if (scope.regionType.id == "geonames") {

diff --git a/web-ui/src/main/resources/catalog/components/utility/partials/regionpicker.html b/web-ui/src/main/resources/catalog/components/utility/partials/regionpicker.html
@@ -18,6 +18,7 @@
     class="form-control"
     autocomplete="off"
     data-gn-region-picker-input=""
+    data-lang="{{lang}}"
     placeholder="{{'chooseRegion' | translate}}"
   />
   <span class="fa fa-spinner fa-spin" data-ng-show="regionLoading"></span>

diff --git a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/csw.html b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/csw.html
@@ -94,6 +94,7 @@
                  data-ng-model="harvesterSelected.searches[0][c].value"/>
         </div>
       </div>-->
+
       <div data-ng-show="cswBboxFilter">
         <label class="control-label" data-translate="">csw-harvesterBboxFilter</label>
         <div
@@ -104,7 +105,7 @@
           data-hbottom=""
           data-htop=""
           data-show-clear-button="true"
-          data-lang="$parent.$parent.lang"
+          data-lang="$parent.lang"
         ></div>
       </div>
     </fieldset>