Skip to content

Commit 4963c46

Browse files
qifeng-baiqifeng-bai
committed
#428 impl(i18n on dynamic menu)
1 parent 4b64a91 commit 4963c46

13 files changed

+71
-31
lines changed

‎grails-app/assets/javascripts/spApp/service/menuService.js

+6
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@
2626

2727
if ($SH.menu.indexOf('http') == 0) {
2828
var setup = $http.get($SH.menu, _httpDescription('getMenu')).then(function (data) {
29+
for(var i = 0; i < data.data.length; i++) {
30+
data.data[i].name = $i18n(data.data[i].name);
31+
for(var j = 0; j < data.data[i].items.length; j++) {
32+
data.data[i].items[j].name = $i18n(data.data[i].items[j].name);
33+
}
34+
}
2935
menuConfig = data.data;
3036
return menuConfig;
3137
});

‎grails-app/assets/javascripts/spApp/service/predefinedAreasService.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
}
4040

4141
return [
42-
MapService.newArea($i18n("Current extent"),
42+
MapService.newArea($i18n(16, "Current extent"),
4343
["longitude:[" + extents[0] + " TO " + extents[2] + "]", "latitude:[" + extents[1] + " TO " + extents[3] + "]"],
4444
'POLYGON((' + extents[0] + ' ' + extents[3] + ',' + extents[0] + ' ' + extents[1] + ',' +
4545
extents[2] + ' ' + extents[1] + ',' + extents[2] + ' ' + extents[3] + ',' +

‎grails-app/assets/javascripts/spApp/service/toolAddFacetService.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
spec: {
1616
"input": [
1717
{
18-
"description": "Select area",
18+
"description": $i18n(352, "Select area."),
1919
"type": "area",
2020
"constraints": {
2121
"min": 1,
@@ -25,7 +25,7 @@
2525
}
2626
},
2727
{
28-
"description": "Species options",
28+
"description": $i18n(411,"Species options."),
2929
"type": "speciesOptions",
3030
"constraints": {
3131
"min": 1,
@@ -34,7 +34,7 @@
3434
}
3535
},
3636
{
37-
"description": "Select facet",
37+
"description": $i18n(412,"Select facet."),
3838
"type": "facet",
3939
"constraints": {
4040
"min": 1,

‎grails-app/assets/javascripts/spApp/service/toolAddLayerService.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
spec: {
1616
"input": [
1717
{
18-
"description": "Select layers.",
18+
"description": $i18n(414,"Select layers."),
1919
"type": "layer",
2020
"constraints": {
2121
"min": 1,
2222
"optional": false
2323
}
2424
}],
25-
"description": "Add environmental and contextual layers to the map."
25+
"description": $i18n(515,"Add environmental and contextual layers to the map.")
2626
},
2727

2828
execute: function (inputs) {

‎grails-app/assets/javascripts/spApp/service/toolAddSpeciesService.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"input": [
1818
{
1919
"name": "species",
20-
"description": "Select species.",
20+
"description": $i18n(416,"Select species."),
2121
"type": "species",
2222
"constraints": {
2323
"min": 1,
@@ -30,7 +30,7 @@
3030
},
3131
{
3232
"name": "speciesOptions",
33-
"description": "Include related areas.",
33+
"description": $i18n(417,"Include related areas."),
3434
"type": "speciesOptions",
3535
"constraints": {
3636
"optional": true,
@@ -41,15 +41,15 @@
4141
},
4242
{
4343
"name": "area",
44-
"description": "Restrict to an area.",
44+
"description": $i18n(418,"Restrict to an area."),
4545
"type": "area",
4646
"constraints": {
4747
"min": 1,
4848
"max": 1,
4949
"defaultToWorld": true
5050
}
5151
}],
52-
"description": "Add a species layer to the map"
52+
"description": $i18n(419,"Add a species layer to the map")
5353
},
5454

5555

‎grails-app/assets/javascripts/spApp/service/toolExportAreaService.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
spec: {
1616
"input": [
1717
{
18-
"description": "Select areas.",
18+
"description": $i18n(420,"Select areas."),
1919
"type": "area",
2020
"constraints": {
2121
"min": 1,
@@ -25,7 +25,7 @@
2525
}
2626
},
2727
{
28-
"description": "Filetype.",
28+
"description": $i18n(421,"Filetype."),
2929
"type": "list",
3030
"constraints": {
3131
"default": "Shapefile",
@@ -41,26 +41,26 @@
4141
}],
4242
"view": [
4343
{
44-
"name": "Select areas to export.",
44+
"name": $i18n(422,"Select areas to export."),
4545
"inputs": [
4646
"area"
4747
]
4848
},
4949
{
50-
"name": "Select filetype.",
50+
"name": $i18n(423,"Select filetype."),
5151
"inputs": [
5252
"layer"
5353
]
5454
},
5555
{
56-
"name": "Number of groups and Shapefile generation",
56+
"name": $i18n(424,"Number of groups and Shapefile generation"),
5757
"inputs": [
5858
"groups",
5959
"shp"
6060
]
6161
}
6262
],
63-
"description": "Export areas."
63+
"description": $i18n(425,"Export areas.")
6464
},
6565

6666
execute: function (inputs) {

‎grails-app/assets/javascripts/spApp/service/toolExportChecklistService.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
spec: {
1616
"input": [
1717
{
18-
"description": "Restrict to an area.",
18+
"description": $i18n(543, "Restrict to an area."),
1919
"type": "area",
2020
"constraints": {
2121
"min": 1,
@@ -24,7 +24,7 @@
2424
}
2525
},
2626
{
27-
"description": "Species options.",
27+
"description": $i18n(411,"Species options."),
2828
"type": "speciesOptions",
2929
"constraints": {
3030
"areaIncludes": false,
@@ -33,7 +33,7 @@
3333
"absentOption": true
3434
}
3535
}],
36-
"description": "Export a species list."
36+
"description": $i18n(426,"Export a species list.")
3737
},
3838

3939
downloading: false,

‎grails-app/assets/javascripts/spApp/service/toolExportDoiService.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"input": [
2121
{
2222
"name": "species",
23-
"description": "Select mapped species.",
23+
"description": $i18n(544,"Select mapped species."),
2424
"type": "species",
2525
"constraints": {
2626
"min": 1,
@@ -39,14 +39,14 @@
3939
},
4040
{
4141
"name":"annotateWorkflow",
42-
"description": "Annotate your workflow",
42+
"description": $i18n(545,"Annotate your workflow"),
4343
"type": "annotation",
4444
"constraints": {
4545
"optional": false
4646
}
4747
}
4848
],
49-
"description": "Export points."
49+
"description": $i18n(546,"Export points.")
5050
},
5151

5252
refresh: function (inputs, specs) {

‎grails-app/assets/javascripts/spApp/service/toolExportMapService.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
}
4040

4141
}],
42-
"description": "Export areas."
42+
"description": $i18n(425,"Export areas.")
4343
},
4444

4545
execute: function (inputs) {

‎grails-app/assets/javascripts/spApp/service/toolExportSampleService.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"input": [
2424
{
2525
"name": "area",
26-
"description": "Select area.",
26+
"description": $i18n(382,"Select area."),
2727
"type": "area",
2828
"constraints": {
2929
"min": 1,
@@ -34,7 +34,7 @@
3434
},
3535
{
3636
"name": "species",
37-
"description": "Select species.",
37+
"description": $i18n(416,"Select species."),
3838
"type": "species",
3939
"constraints": {
4040
"min": 1,
@@ -46,7 +46,7 @@
4646
},
4747
{
4848
"name": "layers",
49-
"description": "Select layers.",
49+
"description": $i18n(414,"Select layers."),
5050
"type": "layer",
5151
"constraints": {
5252
"min": 1,

‎grails-app/assets/javascripts/spApp/spApp.js

+23-3
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,32 @@ function fetchData() {
197197
gMessages[k + ""] = result.data[k]
198198
}
199199
$SH.gMessages = gMessages;
200-
$i18n = function (k) {
201-
var key = ("" + k).replace(" ", "_");
200+
// $i18n = function (k) {
201+
// var key = ("" + k).replace(" ", "_");
202+
// if ($SH.gMessages[key] !== undefined) {
203+
// return $SH.gMessages[key]
204+
// } else {
205+
// return k
206+
// }
207+
// }
208+
/**
209+
* If key is not found in message.properties, use the default value
210+
*
211+
* If no default value is given, use key
212+
*
213+
* @param k key
214+
* @param v optional default value
215+
* @returns {*}
216+
*/
217+
$i18n = function (k, v) {
218+
var key = ("" + k);
202219
if ($SH.gMessages[key] !== undefined) {
203220
return $SH.gMessages[key]
204221
} else {
205-
return k
222+
if (v !== undefined)
223+
return v
224+
else
225+
return k
206226
}
207227
}
208228
}));

‎grails-app/conf/application.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ skin:
171171
favicon: 'https://www.ala.org.au/app/uploads/2019/01/cropped-favicon-32x32.png'
172172

173173
layersService:
174-
url: 'https://localhost:8085/spatial-service/'
174+
url: 'https://spatial.ala.org.au/ws'
175175

176176
lists:
177177
url: 'https://lists.ala.org.au'
@@ -622,6 +622,8 @@ environments:
622622
use-forward-headers: true
623623
grails:
624624
serverURL: http://devt.ala.org.au:8087
625+
layersService:
626+
url: 'http://localhost:8080/ws/'
625627
test:
626628
production:
627629
assets:

‎grails-app/i18n/messages.properties

+13-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,14 @@ typeMismatch.java.lang.Long=Property {0} must be a valid number
5353
typeMismatch.java.lang.Short=Property {0} must be a valid number
5454
typeMismatch.java.math.BigDecimal=Property {0} must be a valid number
5555
typeMismatch.java.math.BigInteger=Property {0} must be a valid number
56+
57+
#menu
58+
#add \ before space or special chars
59+
#Key is case-sensitive
60+
Add\ to\ map=Add to map
61+
Area\ Report\ -\ interactive=Area Report - interactive
62+
63+
5664
# added by grailsApp/assets/javascript/spApp/templates/*
5765
1=×
5866
2=Add area
@@ -571,4 +579,8 @@ typeMismatch.java.math.BigInteger=Property {0} must be a valid number
571579
539=Authentication failed or login session expired, Please login again!
572580
540=An error occurred. Please try again and if the same error occurs, send an email to support@ala.org.au and include the URL to this page, the error message and what steps you performed that triggered this error.
573581
541=Import another species list
574-
542=Current List:
582+
542=Current List:
583+
543=Restrict to an area.
584+
544=Select mapped species.
585+
545=Annotate your workflow
586+
546=Export points.

0 commit comments

Comments
 (0)