← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4022: GIS i18n update.

 

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 4022 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-06-26 11:16:01 +0300
message:
  GIS i18n update.
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/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-23 19:16:44 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties	2011-06-26 06:49:46 +0000
@@ -257,4 +257,36 @@
 font_size							= Font size
 bold_								= Bold
 italic								= Italic
-level								= Level
\ No newline at end of file
+level								= Level
+select_outer_boundary				= Select outer boundary
+select_organisation_unit_level		= Select organisation unit level
+type								= Type
+code								= Code
+address								= Address
+contact_person						= Contact person
+email								= Email
+phone_number						= Phone number
+infrastructural_data				= Infrastructural data
+select_point_level					= Select point level
+level_is_higher_that_boundary_level	= Level is higher than boundary level
+select_new_location_on_map			= Please select the new location on the map..
+show_information_sheet				= Show information sheet
+relocate							= Relocate
+administrator_settings				= Administrator settings
+thematic_layer						= Thematic layer
+register_map_favorite				= Register current map as a favorite
+delete_favorite						= Delete favorite
+register_new_legend					= Register new legend
+delete_legend						= Delete legend
+overlay_							= Overlay
+register_new_legend_set				= Register new legend set
+delete_legend_set					= Delete legend set
+assign_indicators_to_legend_set		= Assign indicators to legend set
+assign_dataelements_to_legend_set	= Assign data elements to legend set
+export_image						= Export image
+export_thematic_map_to_png			= Export thematic map to PNG
+total_distance						= Total distance
+legend								= legend
+symbol_layer						= Symbol layer
+set_thematic_map_date_type			= Set thematic map date type
+date								= Date
\ 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-23 19:16:44 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm	2011-06-26 06:49:46 +0000
@@ -259,5 +259,46 @@
     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' ) , "'")'
+    level: '$encoder.jsEscape($i18n.getString( 'level' ) , "'")',
+    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' ) , "'")',
+    select_outer_boundary: '$encoder.jsEscape($i18n.getString( 'select_outer_boundary' ) , "'")',
+    select_organisation_unit_level: '$encoder.jsEscape($i18n.getString( 'select_organisation_unit_level' ) , "'")',
+    type: '$encoder.jsEscape($i18n.getString( 'type' ) , "'")',
+    code: '$encoder.jsEscape($i18n.getString( 'code' ) , "'")',
+    address: '$encoder.jsEscape($i18n.getString( 'address' ) , "'")',
+    contact_person: '$encoder.jsEscape($i18n.getString( 'contact_person' ) , "'")',
+    email: '$encoder.jsEscape($i18n.getString( 'email' ) , "'")',
+    phone_number: '$encoder.jsEscape($i18n.getString( 'phone_number' ) , "'")',
+    infrastructural_data: '$encoder.jsEscape($i18n.getString( 'infrastructural_data' ) , "'")',
+    select_point_level: '$encoder.jsEscape($i18n.getString( 'select_point_level' ) , "'")',
+    level_is_higher_that_boundary_level: '$encoder.jsEscape($i18n.getString( 'level_is_higher_that_boundary_level' ) , "'")',
+    select_new_location_on_map: '$encoder.jsEscape($i18n.getString( 'select_new_location_on_map' ) , "'")',
+    show_information_sheet: '$encoder.jsEscape($i18n.getString( 'show_information_sheet' ) , "'")',
+    relocate: '$encoder.jsEscape($i18n.getString( 'relocate' ) , "'")',
+    administrator_settings: '$encoder.jsEscape($i18n.getString( 'administrator_settings' ) , "'")',
+    thematic_layer: '$encoder.jsEscape($i18n.getString( 'thematic_layer' ) , "'")',
+    register_map_favorite: '$encoder.jsEscape($i18n.getString( 'register_map_favorite' ) , "'")',
+    delete_favorite: '$encoder.jsEscape($i18n.getString( 'delete_favorite' ) , "'")',
+    register_new_legend: '$encoder.jsEscape($i18n.getString( 'register_new_legend' ) , "'")',
+    delete_legend: '$encoder.jsEscape($i18n.getString( 'delete_legend' ) , "'")',
+    overlay_: '$encoder.jsEscape($i18n.getString( 'overlay_' ) , "'")',
+    register_new_legend_set: '$encoder.jsEscape($i18n.getString( 'register_new_legend_set' ) , "'")',
+    delete_legend_set: '$encoder.jsEscape($i18n.getString( 'delete_legend_set' ) , "'")',
+    assign_indicators_to_legend_set: '$encoder.jsEscape($i18n.getString( 'assign_indicators_to_legend_set' ) , "'")',
+    assign_dataelements_to_legend_set: '$encoder.jsEscape($i18n.getString( 'assign_dataelements_to_legend_set' ) , "'")',
+    export_image: '$encoder.jsEscape($i18n.getString( 'export_image' ) , "'")',
+    export_thematic_map_to_png: '$encoder.jsEscape($i18n.getString( 'export_thematic_map_to_png' ) , "'")',
+    total_distance: '$encoder.jsEscape($i18n.getString( 'total_distance' ) , "'")',
+    legend: '$encoder.jsEscape($i18n.getString( 'legend' ) , "'")',
+    symbol_layer: '$encoder.jsEscape($i18n.getString( 'symbol_layer' ) , "'")',
+    set_thematic_map_date_type: '$encoder.jsEscape($i18n.getString( 'set_thematic_map_date_type' ) , "'")',
+    date: '$encoder.jsEscape($i18n.getString( 'date' ) , "'")'    
 };
\ No newline at end of file

=== 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 19:16:44 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2011-06-26 06:49:46 +0000
@@ -940,7 +940,7 @@
 								xtype: 'panel',
 								bodyStyle: 'padding:8px; background-color:#ffffff',
 								items: [
-									{html: '<div class="window-info">Select outer boundary</div>'},
+									{html: '<div class="window-info">' + G.i18n.select_outer_boundary + '</div>'},
 									{
 										xtype: 'treepanel',
 										bodyStyle: 'background-color:#ffffff',
@@ -983,7 +983,7 @@
 								bodyStyle: 'padding:8px; background-color:#ffffff',
                                 labelWidth: G.conf.label_width,
 								items: [
-									{html: '<div class="window-info">Select organisation unit level</div>'},
+									{html: '<div class="window-info">' + G.i18n.select_organisation_unit_level + '</div>'},
 									{
 										xtype: 'combo',
 										fieldLabel: G.i18n.level,
@@ -1115,12 +1115,12 @@
                                     bodyStyle: 'padding:8px 4px 8px 8px',
                                     width: 160,
                                     items: [
-                                        {html: '<div class="window-info">Type<p style="font-weight:normal">' + feature.attributes.type + '</p></div>'},
-                                        {html: '<div class="window-info">Code<p style="font-weight:normal">' + feature.attributes.code + '</p></div>'},
-                                        {html: '<div class="window-info">Address<p style="font-weight:normal">' + feature.attributes.ad + '</p></div>'},
-                                        {html: '<div class="window-info">Contact person<p style="font-weight:normal">' + feature.attributes.cp + '</p></div>'},
-                                        {html: '<div class="window-info">Email<p style="font-weight:normal">' + feature.attributes.em + '</p></div>'},
-                                        {html: '<div class="window-info">Phone number<p style="font-weight:normal">' + feature.attributes.pn + '</p></div>'}
+                                        {html: '<div class="window-info">' + G.i18n.type + '<p style="font-weight:normal">' + feature.attributes.type + '</p></div>'},
+                                        {html: '<div class="window-info">' + G.i18n.code + '<p style="font-weight:normal">' + feature.attributes.code + '</p></div>'},
+                                        {html: '<div class="window-info">' + G.i18n.address + '<p style="font-weight:normal">' + feature.attributes.ad + '</p></div>'},
+                                        {html: '<div class="window-info">' + G.i18n.contact_person + '<p style="font-weight:normal">' + feature.attributes.cp + '</p></div>'},
+                                        {html: '<div class="window-info">' + G.i18n.email + '<p style="font-weight:normal">' + feature.attributes.em + '</p></div>'},
+                                        {html: '<div class="window-info">' + G.i18n.phone_number + '<p style="font-weight:normal">' + feature.attributes.pn + '</p></div>'}
                                     ]
                                 },
                                 {
@@ -1129,7 +1129,7 @@
                                     width: G.conf.window_width + 20,
                                     labelWidth: G.conf.label_width,
                                     items: [
-                                        {html: '<div class="window-info">Infrastructural data</div>'},
+                                        {html: '<div class="window-info">' + G.i18n.infrastructural_data + '</div>'},
                                         {
                                             xtype: 'combo',
                                             name: 'period',
@@ -1199,7 +1199,7 @@
                                     xtype: 'panel',
                                     bodyStyle: 'padding:8px',
                                     items: [
-                                        {html: 'Please select the new location on the map..'}
+                                        {html: G.i18n.select_new_location_on_map}
                                     ]
                                 }
                             ],
@@ -1229,7 +1229,7 @@
                     },
                     items: [
                         {
-                            text: 'Show information sheet',
+                            text: G.i18n.show_information_sheet,
                             iconCls: 'menu-featureoptions-info',
                             handler: function(item) {
                                 if (G.stores.infrastructuralPeriodsByType.isLoaded) {
@@ -1244,7 +1244,7 @@
                             }
                         },
                         {
-                            text: 'Relocate',
+                            text: G.i18n.relocate,
                             iconCls: 'menu-featureoptions-relocate',
                             disabled: !G.user.isAdmin,
                             handler: function(item) {
@@ -1815,7 +1815,7 @@
     onRender: function(ct, position) {
         mapfish.widgets.geostat.Choropleth.superclass.onRender.apply(this, arguments);
 
-        var coreOptions = {
+		var coreOptions = {
             'layer': this.layer,
             'format': this.format,
             'url': this.url,

=== 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 19:16:44 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js	2011-06-26 06:49:46 +0000
@@ -911,7 +911,7 @@
 								xtype: 'panel',
 								bodyStyle: 'padding:8px; background-color:#ffffff',
 								items: [
-									{html: '<div class="window-info">Select outer boundary</div>'},
+									{html: '<div class="window-info">' + G.i18n.select_outer_boundary + '</div>'},
 									{
 										xtype: 'treepanel',
 										bodyStyle: 'background-color:#ffffff',
@@ -954,7 +954,7 @@
 								bodyStyle: 'padding:8px; background-color:#ffffff',
                                 labelWidth: G.conf.label_width,
 								items: [
-									{html: '<div class="window-info">Select organisation unit level</div>'},
+									{html: '<div class="window-info">' + G.i18n.select_organisation_unit_level + '</div>'},
 									{
 										xtype: 'combo',
 										fieldLabel: G.i18n.level,
@@ -967,7 +967,7 @@
 										selectOnFocus: true,
 										emptyText: G.conf.emptytext,
 										labelSeparator: G.conf.labelseparator,
-                                        fieldLabel: G.i18n.level,
+										fieldLabel: G.i18n.level,
 										width: G.conf.combo_width_fieldset,
 										minListWidth: G.conf.combo_width_fieldset,
 										store: G.stores.organisationUnitLevel,
@@ -996,7 +996,7 @@
 										return;
 									}
 									if (node.attributes.level > this.form.findField('level').levelComboBox.getValue()) {
-										Ext.message.msg(false, 'Level is higher than boundary level');
+										Ext.message.msg(false, G.i18n.level_is_higher_that_boundary_level);
 										return;
 									}
                                     
@@ -1086,12 +1086,12 @@
                                     bodyStyle: 'padding:8px 4px 8px 8px',
                                     width: 160,
                                     items: [
-                                        {html: '<div class="window-info">Type<p style="font-weight:normal">' + feature.attributes.type + '</p></div>'},
-                                        {html: '<div class="window-info">Code<p style="font-weight:normal">' + feature.attributes.code + '</p></div>'},
-                                        {html: '<div class="window-info">Address<p style="font-weight:normal">' + feature.attributes.ad + '</p></div>'},
-                                        {html: '<div class="window-info">Contact person<p style="font-weight:normal">' + feature.attributes.cp + '</p></div>'},
-                                        {html: '<div class="window-info">Email<p style="font-weight:normal">' + feature.attributes.em + '</p></div>'},
-                                        {html: '<div class="window-info">Phone number<p style="font-weight:normal">' + feature.attributes.pn + '</p></div>'}
+                                        {html: '<div class="window-info">' + G.i18n.type + '<p style="font-weight:normal">' + feature.attributes.type + '</p></div>'},
+                                        {html: '<div class="window-info">' + G.i18n.code + '<p style="font-weight:normal">' + feature.attributes.code + '</p></div>'},
+                                        {html: '<div class="window-info">' + G.i18n.address + '<p style="font-weight:normal">' + feature.attributes.ad + '</p></div>'},
+                                        {html: '<div class="window-info">' + G.i18n.contact_person + '<p style="font-weight:normal">' + feature.attributes.cp + '</p></div>'},
+                                        {html: '<div class="window-info">' + G.i18n.email + '<p style="font-weight:normal">' + feature.attributes.em + '</p></div>'},
+                                        {html: '<div class="window-info">' + G.i18n.phone_number + '<p style="font-weight:normal">' + feature.attributes.pn + '</p></div>'}
                                     ]
                                 },
                                 {
@@ -1100,7 +1100,7 @@
                                     width: G.conf.window_width + 20,
                                     labelWidth: G.conf.label_width,
                                     items: [
-                                        {html: '<div class="window-info">Infrastructural data</div>'},
+                                        {html: '<div class="window-info">' + G.i18n.infrastructural_data + '</div>'},
                                         {
                                             xtype: 'combo',
                                             name: 'period',
@@ -1170,7 +1170,7 @@
                                     xtype: 'panel',
                                     bodyStyle: 'padding:8px',
                                     items: [
-                                        {html: 'Please select the new location on the map..'}
+                                        {html: G.i18n.select_new_location_on_map}
                                     ]
                                 }
                             ],
@@ -1200,7 +1200,7 @@
                     },
                     items: [
                         {
-                            text: 'Show information sheet',
+                            text: G.i18n.show_information_sheet,
                             iconCls: 'menu-featureoptions-info',
                             handler: function(item) {
                                 if (G.stores.infrastructuralPeriodsByType.isLoaded) {
@@ -1215,7 +1215,7 @@
                             }
                         },
                         {
-                            text: 'Relocate',
+                            text: G.i18n.relocate,
                             iconCls: 'menu-featureoptions-relocate',
                             disabled: !G.user.isAdmin,
                             handler: function(item) {
@@ -1595,7 +1595,7 @@
     formValues: {
 		getAllValues: function() {
 			return {
-				mapValueType: this.form.findField('mapvaluetype').getValue(),
+                mapValueType: this.form.findField('mapvaluetype').getValue(),
                 indicatorGroupId: this.valueType.isIndicator() ? this.form.findField('indicatorgroup').getValue() : null,
                 indicatorId: this.valueType.isIndicator() ? this.form.findField('indicator').getValue() : null,
 				indicatorName: this.valueType.isIndicator() ? this.form.findField('indicator').getRawValue() : null,
@@ -1608,23 +1608,23 @@
                 periodName: G.system.mapDateType.isFixed() ? this.form.findField('period').getRawValue() : null,
                 startDate: G.system.mapDateType.isStartEnd() ? this.form.findField('startdate').getRawValue() : null,
                 endDate: G.system.mapDateType.isStartEnd() ? this.form.findField('enddate').getRawValue() : null,
-				parentOrganisationUnitId: this.organisationUnitSelection.parent.id,
+                parentOrganisationUnitId: this.organisationUnitSelection.parent.id,
                 parentOrganisationUnitLevel: this.organisationUnitSelection.parent.level,
                 parentOrganisationUnitName: this.organisationUnitSelection.parent.name,
-				organisationUnitLevel: this.organisationUnitSelection.level.level,
+                organisationUnitLevel: this.organisationUnitSelection.level.level,
                 organisationUnitLevelName: this.organisationUnitSelection.level.name,
-				mapLegendType: this.form.findField('maplegendtype').getValue(),
-				method: this.legend.value == G.conf.map_legend_type_automatic ? this.form.findField('method').getValue() : null,
-				classes: this.legend.value == G.conf.map_legend_type_automatic ? this.form.findField('classes').getValue() : null,
-				bounds: this.legend.value == G.conf.map_legend_type_automatic && this.legend.method == G.conf.classify_with_bounds ? this.form.findField('bounds').getValue() : null,
-				colorLow: this.legend.value == G.conf.map_legend_type_automatic ? this.form.findField('startcolor').getValue() : null,
-				colorHigh: this.legend.value == G.conf.map_legend_type_automatic ? this.form.findField('endcolor').getValue() : null,
+                mapLegendType: this.form.findField('maplegendtype').getValue(),
+                method: this.legend.value == G.conf.map_legend_type_automatic ? this.form.findField('method').getValue() : null,
+                classes: this.legend.value == G.conf.map_legend_type_automatic ? this.form.findField('classes').getValue() : null,
+                bounds: this.legend.value == G.conf.map_legend_type_automatic && this.legend.method == G.conf.classify_with_bounds ? this.form.findField('bounds').getValue() : null,
+                colorLow: this.legend.value == G.conf.map_legend_type_automatic ? this.form.findField('startcolor').getValue() : null,
+                colorHigh: this.legend.value == G.conf.map_legend_type_automatic ? this.form.findField('endcolor').getValue() : null,
                 mapLegendSetId: this.legend.value == G.conf.map_legend_type_predefined ? this.form.findField('maplegendset').getValue() : null,
 				radiusLow: this.form.findField('radiuslow').getValue(),
 				radiusHigh: this.form.findField('radiushigh').getValue(),
-				longitude: G.vars.map.getCenter().lon,
-				latitude: G.vars.map.getCenter().lat,
-				zoom: parseFloat(G.vars.map.getZoom())
+                longitude: G.vars.map.getCenter().lon,
+                latitude: G.vars.map.getCenter().lat,
+                zoom: parseFloat(G.vars.map.getZoom())
 			};
 		},
         
@@ -1785,8 +1785,8 @@
     
     onRender: function(ct, position) {
         mapfish.widgets.geostat.Point.superclass.onRender.apply(this, arguments);
-        
-        var coreOptions = {
+
+		var coreOptions = {
             'layer': this.layer,
             'format': this.format,
             'url': this.url,

=== 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 19:16:44 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js	2011-06-26 06:49:46 +0000
@@ -386,7 +386,7 @@
 								xtype: 'panel',
 								bodyStyle: 'padding:8px; background-color:#ffffff',
 								items: [
-									{html: '<div class="window-info">Select outer boundary</div>'},
+									{html: '<div class="window-info">' + G.i18n.select_outer_boundary + '</div>'},
 									{
 										xtype: 'treepanel',
 										bodyStyle: 'background-color:#ffffff',
@@ -429,7 +429,7 @@
 								bodyStyle: 'padding:8px; background-color:#ffffff',
                                 labelWidth: G.conf.label_width,
 								items: [
-									{html: '<div class="window-info">Select point level</div>'},
+									{html: '<div class="window-info">' + G.i18n.select_point_level + '</div>'},
 									{
 										xtype: 'combo',
 										fieldLabel: G.i18n.level,
@@ -471,7 +471,7 @@
 										return;
 									}
 									if (node.attributes.level > this.form.findField('level').levelComboBox.getValue()) {
-										Ext.message.msg(false, 'Level is higher than boundary level');
+										Ext.message.msg(false, G.i18n.level_is_higher_that_boundary_level);
 										return;
 									}
 
@@ -556,12 +556,12 @@
                                     bodyStyle: 'padding:8px 4px 8px 8px',
                                     width: 160,
                                     items: [
-                                        {html: '<div class="window-info">Type<p style="font-weight:normal">' + feature.attributes.type + '</p></div>'},
-                                        {html: '<div class="window-info">Code<p style="font-weight:normal">' + feature.attributes.code + '</p></div>'},
-                                        {html: '<div class="window-info">Address<p style="font-weight:normal">' + feature.attributes.ad + '</p></div>'},
-                                        {html: '<div class="window-info">Contact person<p style="font-weight:normal">' + feature.attributes.cp + '</p></div>'},
-                                        {html: '<div class="window-info">Email<p style="font-weight:normal">' + feature.attributes.em + '</p></div>'},
-                                        {html: '<div class="window-info">Phone number<p style="font-weight:normal">' + feature.attributes.pn + '</p></div>'}
+                                        {html: '<div class="window-info">' + G.i18n.type + '<p style="font-weight:normal">' + feature.attributes.type + '</p></div>'},
+                                        {html: '<div class="window-info">' + G.i18n.code + '<p style="font-weight:normal">' + feature.attributes.code + '</p></div>'},
+                                        {html: '<div class="window-info">' + G.i18n.address + '<p style="font-weight:normal">' + feature.attributes.ad + '</p></div>'},
+                                        {html: '<div class="window-info">' + G.i18n.contact_person + '<p style="font-weight:normal">' + feature.attributes.cp + '</p></div>'},
+                                        {html: '<div class="window-info">' + G.i18n.email + '<p style="font-weight:normal">' + feature.attributes.em + '</p></div>'},
+                                        {html: '<div class="window-info">' + G.i18n.phone_number + '<p style="font-weight:normal">' + feature.attributes.pn + '</p></div>'}
                                     ]
                                 },
                                 {
@@ -570,7 +570,7 @@
                                     width: G.conf.window_width + 20,
                                     labelWidth: G.conf.label_width,
                                     items: [
-                                        {html: '<div class="window-info">Infrastructural data</div>'},
+                                        {html: '<div class="window-info">' + G.i18n.infrastructural_data + '</div>'},
                                         {
                                             xtype: 'combo',
                                             name: 'period',
@@ -640,7 +640,7 @@
                                     xtype: 'panel',
                                     bodyStyle: 'padding:8px',
                                     items: [
-                                        {html: 'Please select the new location on the map..'}
+                                        {html: G.i18n.select_new_location_on_map}
                                     ]
                                 }
                             ],
@@ -670,7 +670,7 @@
                     },
                     items: [
                         {
-                            text: 'Show information sheet',
+                            text: G.i18n.show_information_sheet,
                             iconCls: 'menu-featureoptions-info',
                             handler: function(item) {
                                 if (G.stores.infrastructuralPeriodsByType.isLoaded) {
@@ -685,7 +685,7 @@
                             }
                         },
                         {
-                            text: 'Relocate',
+                            text: G.i18n.relocate,
                             iconCls: 'menu-featureoptions-relocate',
                             disabled: !G.user.isAdmin,
                             handler: function(item) {