dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #30074
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15261: PT DV GIS, i18n.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 15261 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-05-14 00:19:43 +0200
message:
PT DV GIS, i18n.
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/i18n.json
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css
dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module.properties
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/i18n.json
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js
dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/i18n.json
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties 2014-02-08 18:09:18 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties 2014-05-13 21:53:54 +0000
@@ -403,4 +403,10 @@
relative=Relative
reporting_rates=Reporting rates
event_layer=Event layer
-coordinate=Coordinate
\ No newline at end of file
+coordinate=Coordinate
+go_to_pivot_tables=Go to pivot tables
+open_this_map_as_table=Open this map as table
+open_last_table=Open last table
+go_to_charts=Go to charts
+open_this_map_as_chart=Open this map as chart
+open_last_chart=Open last chart
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/i18n.json'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/i18n.json 2014-02-08 18:09:18 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/i18n.json 2014-05-13 21:53:54 +0000
@@ -427,5 +427,11 @@
"relative",
"reporting_rates",
"event_layer",
-"coordinate"
+"coordinate",
+"go_to_pivot_tables",
+"open_this_map_as_table",
+"open_last_table",
+"go_to_charts",
+"open_this_map_as_chart",
+"open_last_chart"
]
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2014-05-08 13:39:44 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2014-05-13 21:53:54 +0000
@@ -8191,7 +8191,7 @@
showSeparator: false,
items: [
{
- text: 'Go to pivot tables' + ' ', //i18n
+ text: GIS.i18n.go_to_pivot_tables + ' ', //i18n
cls: 'gis-menu-item-noicon',
handler: function() {
window.location.href = gis.init.contextPath + '/dhis-web-pivot/app/index.html';
@@ -8199,7 +8199,7 @@
},
'-',
{
- text: 'Open this map as table' + ' ', //i18n
+ text: GIS.i18n.open_this_map_as_table + ' ', //i18n
cls: 'gis-menu-item-noicon',
disabled: !(GIS.isSessionStorage && gis.util.layout.getAnalytical()),
handler: function() {
@@ -8209,7 +8209,7 @@
}
},
{
- text: 'Open last table' + ' ', //i18n
+ text: GIS.i18n.open_last_table + ' ', //i18n
cls: 'gis-menu-item-noicon',
disabled: !(GIS.isSessionStorage && JSON.parse(sessionStorage.getItem('dhis2')) && JSON.parse(sessionStorage.getItem('dhis2'))['table']),
handler: function() {
@@ -8247,7 +8247,7 @@
showSeparator: false,
items: [
{
- text: 'Go to charts' + ' ', //i18n
+ text: GIS.i18n.go_to_charts + ' ', //i18n
cls: 'gis-menu-item-noicon',
handler: function() {
window.location.href = gis.init.contextPath + '/dhis-web-visualizer/app/index.html';
@@ -8255,7 +8255,7 @@
},
'-',
{
- text: 'Open this map as chart' + ' ', //i18n
+ text: GIS.i18n.open_this_map_as_chart + ' ', //i18n
cls: 'gis-menu-item-noicon',
disabled: !GIS.isSessionStorage || !gis.util.layout.getAnalytical(),
handler: function() {
@@ -8265,7 +8265,7 @@
}
},
{
- text: 'Open last chart' + ' ', //i18n
+ text: GIS.i18n.open_last_chart + ' ', //i18n
cls: 'gis-menu-item-noicon',
disabled: !(GIS.isSessionStorage && JSON.parse(sessionStorage.getItem('dhis2')) && JSON.parse(sessionStorage.getItem('dhis2'))['chart']),
handler: function() {
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css 2014-01-03 18:54:29 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css 2014-05-13 21:53:54 +0000
@@ -592,6 +592,10 @@
* GIS Menu
*--------------------------------------------------------------------------*/
+.gis-menu-item-noicon .x-menu-item-link {
+ padding-left: 10px;
+}
+
.gis-toolbar-btn-menu-first { /* Boundary layer menu spacing from viewport */
left: 2px !important;
}
=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module.properties 2014-04-29 13:05:52 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module.properties 2014-05-13 22:04:48 +0000
@@ -152,4 +152,10 @@
sum=Sum
by_data_element=By data element
stddev=Standard deviation
-variance=Variance
\ No newline at end of file
+variance=Variance
+go_to_charts=Go to charts
+open_this_table_as_chart=Open this table as chart
+open_last_chart=Open last chart
+go_to_maps=Go to maps
+open_this_table_as_map=Open this table as map
+open_last_map=Open last map
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/i18n.json'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/i18n.json 2014-04-29 13:05:52 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/i18n.json 2014-05-13 22:04:48 +0000
@@ -153,5 +153,11 @@
"sum",
"by_data_element",
"stddev",
-"variance"
+"variance",
+"go_to_charts",
+"open_this_table_as_chart",
+"open_last_chart",
+"go_to_maps",
+"open_this_table_as_map",
+"open_last_map"
]
=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-05-02 11:27:36 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-05-13 22:04:48 +0000
@@ -5304,7 +5304,7 @@
showSeparator: false,
items: [
{
- text: 'Go to charts' + ' ', //i18n
+ text: NS.i18n.go_to_charts + ' ', //i18n
cls: 'ns-menu-item-noicon',
handler: function() {
window.location.href = ns.core.init.contextPath + '/dhis-web-visualizer/app/index.html';
@@ -5312,7 +5312,7 @@
},
'-',
{
- text: 'Open this table as chart' + ' ', //i18n
+ text: NS.i18n.open_this_table_as_chart + ' ', //i18n
cls: 'ns-menu-item-noicon',
disabled: !(NS.isSessionStorage && ns.app.layout),
handler: function() {
@@ -5323,7 +5323,7 @@
}
},
{
- text: 'Open last chart' + ' ', //i18n
+ text: NS.i18n.open_last_chart + ' ', //i18n
cls: 'ns-menu-item-noicon',
disabled: !(NS.isSessionStorage && JSON.parse(sessionStorage.getItem('dhis2')) && JSON.parse(sessionStorage.getItem('dhis2'))['chart']),
handler: function() {
@@ -5360,7 +5360,7 @@
showSeparator: false,
items: [
{
- text: 'Go to maps' + ' ', //i18n
+ text: NS.i18n.go_to_maps + ' ', //i18n
cls: 'ns-menu-item-noicon',
handler: function() {
window.location.href = ns.core.init.contextPath + '/dhis-web-mapping/app/index.html';
@@ -5368,7 +5368,7 @@
},
'-',
{
- text: 'Open this table as map' + ' ', //i18n
+ text: NS.i18n.open_this_table_as_map + ' ', //i18n
cls: 'ns-menu-item-noicon',
disabled: !(NS.isSessionStorage && ns.app.layout),
handler: function() {
@@ -5379,7 +5379,7 @@
}
},
{
- text: 'Open last map' + ' ', //i18n
+ text: NS.i18n.open_last_map + ' ', //i18n
cls: 'ns-menu-item-noicon',
disabled: !(NS.isSessionStorage && JSON.parse(sessionStorage.getItem('dhis2')) && JSON.parse(sessionStorage.getItem('dhis2'))['map']),
handler: function() {
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties 2014-04-15 12:43:39 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties 2014-05-13 22:16:51 +0000
@@ -217,4 +217,10 @@
all_data_elements=All data elements
hide_empty_category_items=Hide empty category items
axes=Axes
-general=General
\ No newline at end of file
+general=General
+go_to_pivot_tables=Go to pivot tables
+open_this_chart_as_pivot_table=Open this chart as pivot table
+open_last_pivot_table=Open last pivot table
+go_to_maps=Go to maps
+open_this_chart_as_map=Open this chart as map
+open_last_map=Open last map
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/i18n.json'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/i18n.json 2014-04-15 12:43:39 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/i18n.json 2014-05-13 22:16:51 +0000
@@ -217,5 +217,11 @@
"all_data_elements",
"hide_empty_category_items",
"axes",
-"general"
+"general",
+"go_to_pivot_tables",
+"open_this_chart_as_pivot_table",
+"open_last_pivot_table",
+"go_to_maps",
+"open_this_chart_as_map",
+"open_last_map"
]
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-05-05 09:55:43 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-05-13 22:16:51 +0000
@@ -5061,7 +5061,7 @@
showSeparator: false,
items: [
{
- text: 'Go to pivot tables' + ' ', //i18n
+ text: NS.i18n.go_to_pivot_tables + ' ', //i18n
cls: 'ns-menu-item-noicon',
handler: function() {
window.location.href = ns.core.init.contextPath + '/dhis-web-pivot/app/index.html';
@@ -5069,7 +5069,7 @@
},
'-',
{
- text: 'Open this chart as pivot table' + ' ', //i18n
+ text: NS.i18n.open_this_chart_as_pivot_table + ' ', //i18n
cls: 'ns-menu-item-noicon',
disabled: !(NS.isSessionStorage && ns.app.layout),
handler: function() {
@@ -5080,7 +5080,7 @@
}
},
{
- text: 'Open last pivot table' + ' ', //i18n
+ text: NS.i18n.open_last_pivot_table + ' ', //i18n
cls: 'ns-menu-item-noicon',
disabled: !(NS.isSessionStorage && JSON.parse(sessionStorage.getItem('dhis2')) && JSON.parse(sessionStorage.getItem('dhis2'))['table']),
handler: function() {
@@ -5118,7 +5118,7 @@
showSeparator: false,
items: [
{
- text: 'Go to maps' + ' ', //i18n
+ text: NS.i18n.go_to_maps + ' ', //i18n
cls: 'ns-menu-item-noicon',
handler: function() {
window.location.href = ns.core.init.contextPath + '/dhis-web-mapping/app/index.html';
@@ -5126,7 +5126,7 @@
},
'-',
{
- text: 'Open this chart as map' + ' ', //i18n
+ text: NS.i18n.open_this_chart_as_map + ' ', //i18n
cls: 'ns-menu-item-noicon',
disabled: !(NS.isSessionStorage && ns.app.layout),
handler: function() {
@@ -5137,7 +5137,7 @@
}
},
{
- text: 'Open last map' + ' ', //i18n
+ text: NS.i18n.open_last_map + ' ', //i18n
cls: 'ns-menu-item-noicon',
disabled: !(NS.isSessionStorage && JSON.parse(sessionStorage.getItem('dhis2')) && JSON.parse(sessionStorage.getItem('dhis2'))['map']),
handler: function() {
