dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12816
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4016: GIS i18n updated.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 4016 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-06-24 07:49:49 +0300
message:
GIS i18n updated.
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/i18n.vm
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.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 2011-06-22 19:38:25 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties 2011-06-23 19:16:44 +0000
@@ -247,4 +247,14 @@
geojson_file = GeoJSON file
history = History
api_key = API key
-measure_distance = Measure distance
\ No newline at end of file
+measure_distance = Measure distance
+low_point_size = Low point size
+high_point_size = High point size
+system = System
+width = Width
+height = Height
+text_filter = Text filter
+font_size = Font size
+bold_ = Bold
+italic = Italic
+level = Level
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm 2011-06-22 19:38:25 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm 2011-06-23 19:16:44 +0000
@@ -249,5 +249,15 @@
geojson_file: '$encoder.jsEscape($i18n.getString( 'geojson_file' ) , "'")',
history: '$encoder.jsEscape($i18n.getString( 'history' ) , "'")',
api_key: '$encoder.jsEscape($i18n.getString( 'api_key' ) , "'")',
- measure_distance: '$encoder.jsEscape($i18n.getString( 'measure_distance' ) , "'")'
+ measure_distance: '$encoder.jsEscape($i18n.getString( 'measure_distance' ) , "'")',
+ low_point_size: '$encoder.jsEscape($i18n.getString( 'low_point_size' ) , "'")',
+ high_point_size: '$encoder.jsEscape($i18n.getString( 'high_point_size' ) , "'")',
+ system: '$encoder.jsEscape($i18n.getString( 'system' ) , "'")',
+ width: '$encoder.jsEscape($i18n.getString( 'width' ) , "'")',
+ height: '$encoder.jsEscape($i18n.getString( 'height' ) , "'")',
+ text_filter: '$encoder.jsEscape($i18n.getString( 'text_filter' ) , "'")',
+ font_size: '$encoder.jsEscape($i18n.getString( 'font_size' ) , "'")',
+ bold_: '$encoder.jsEscape($i18n.getString( 'bold_' ) , "'")',
+ italic: '$encoder.jsEscape($i18n.getString( 'italic' ) , "'")',
+ level: '$encoder.jsEscape($i18n.getString( 'level' ) , "'")'
};
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 2011-06-23 17:26:56 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 2011-06-23 19:16:44 +0000
@@ -274,7 +274,7 @@
}
/* Ext Loading Mask */
-.x-mask-loading2 div {
+.x-mask-loading2 div {
padding:5px 11px 6px 32px;
background:#fbfbfb url('../../../images/loader.gif') no-repeat 5px 2px;
line-height:20px;
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js 2011-06-23 17:18:32 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js 2011-06-23 19:16:44 +0000
@@ -380,7 +380,7 @@
xtype: 'checkbox',
id: 'favoritesystem_chb',
disabled: !G.user.isAdmin,
- fieldLabel: 'System',
+ fieldLabel: G.i18n.system,
labelSeparator: G.conf.labelseparator,
editable: false
},
@@ -569,7 +569,7 @@
{
xtype: 'combo',
id: 'exportimagewidth_cb',
- fieldLabel: 'Width',
+ fieldLabel: G.i18n.width,
labelSeparator: G.conf.labelseparator,
editable: false,
valueField: 'width',
@@ -587,7 +587,7 @@
{
xtype: 'combo',
id: 'exportimageheight_cb',
- fieldLabel: 'Height',
+ fieldLabel: G.i18n.height,
labelSeparator: G.conf.labelseparator,
editable: false,
valueField: 'height',
@@ -1800,7 +1800,7 @@
id: 'locatefeature_tf',
emptyText: G.conf.emptytext,
labelSeparator: G.conf.labelseparator,
- fieldLabel: 'Text filter',
+ fieldLabel: G.i18n.text_filter,
width: G.conf.combo_width_fieldset,
enableKeyEvents: true,
listeners: {
@@ -1899,7 +1899,7 @@
{
xtype: 'numberfield',
id: 'labelfontsize_nf',
- fieldLabel: 'Font size',
+ fieldLabel: G.i18n.font_size,
labelSeparator: G.conf.labelseparator,
width: G.conf.combo_number_width_small,
enableKeyEvents: true,
@@ -1920,7 +1920,7 @@
{
xtype: 'checkbox',
id: 'labelstrong_chb',
- fieldLabel: '<b>Bold</b>',
+ fieldLabel: '<b>' + G.i18n.bold_ + '</b>',
labelSeparator: G.conf.labelseparator,
listeners: {
'check': function(chb, checked) {
@@ -1935,7 +1935,7 @@
{
xtype: 'checkbox',
id: 'labelitalic_chb',
- fieldLabel: '<i>Italic</i>',
+ fieldLabel: '<i>' + G.i18n.italic + '</i>',
labelSeparator: G.conf.labelseparator,
listeners: {
'check': function(chb, checked) {
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js 2011-06-23 17:18:32 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js 2011-06-23 19:16:44 +0000
@@ -874,7 +874,7 @@
{
xtype: 'numberfield',
name: 'radiuslow',
- fieldLabel: 'Low point size',
+ fieldLabel: G.i18n.low_point_size,
width: G.conf.combo_number_width_small,
allowDecimals: false,
allowNegative: false,
@@ -893,7 +893,7 @@
{
xtype: 'numberfield',
name: 'radiushigh',
- fieldLabel: 'High point size',
+ fieldLabel: G.i18n.high_point_size,
width: G.conf.combo_number_width_small,
allowDecimals: false,
allowNegative: false,
@@ -996,7 +996,7 @@
selectOnFocus: true,
emptyText: G.conf.emptytext,
labelSeparator: G.conf.labelseparator,
- fieldLabel: 'Level',
+ fieldLabel: G.i18n.level,
width: G.conf.combo_width_fieldset,
minListWidth: G.conf.combo_width_fieldset,
store: G.stores.organisationUnitLevel,
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js 2011-06-23 17:18:32 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js 2011-06-23 19:16:44 +0000
@@ -845,7 +845,7 @@
{
xtype: 'numberfield',
name: 'radiuslow',
- fieldLabel: 'Low point size',
+ fieldLabel: G.i18n.low_point_size,
width: G.conf.combo_number_width_small,
allowDecimals: false,
allowNegative: false,
@@ -864,7 +864,7 @@
{
xtype: 'numberfield',
name: 'radiushigh',
- fieldLabel: 'High point size',
+ fieldLabel: G.i18n.high_point_size,
width: G.conf.combo_number_width_small,
allowDecimals: false,
allowNegative: false,
@@ -967,7 +967,7 @@
selectOnFocus: true,
emptyText: G.conf.emptytext,
labelSeparator: G.conf.labelseparator,
- fieldLabel: 'Level',
+ fieldLabel: G.i18n.level,
width: G.conf.combo_width_fieldset,
minListWidth: G.conf.combo_width_fieldset,
store: G.stores.organisationUnitLevel,
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js 2011-06-23 17:18:32 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js 2011-06-23 19:16:44 +0000
@@ -442,7 +442,7 @@
selectOnFocus: true,
emptyText: G.conf.emptytext,
labelSeparator: G.conf.labelseparator,
- fieldLabel: 'Level',
+ fieldLabel: G.i18n.level,
width: G.conf.combo_width_fieldset,
minListWidth: G.conf.combo_width_fieldset,
store: G.stores.organisationUnitLevel,
