dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #22093
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10604: (PT) i18n.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 10604 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-04-17 14:48:21 +0200
message:
(PT) i18n.
modified:
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/scripts/app.js
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/i18n.vm
--
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-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 2013-04-17 11:52:56 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module.properties 2013-04-17 12:44:45 +0000
@@ -9,6 +9,11 @@
display_density=Display density
font_size=Font size
digit_group_separator=Digit group separator
+comfortable=Comfortable
+compact=Compact
+large=Large
+small_=Small
+normal=Normal
reporting_period=Reporting period
organisation_unit=Organisation unit
organisation_units=Organisation units
@@ -20,13 +25,19 @@
update=Update
cancel=Cancel
delete_=Delete
+save=Save
+hide=Hide
add_new=Add new
+manage_favorites=Manage favorites
search_for_favorites=Search for favorites
+overwrite_favorite=Overwrite favorite
+delete_favorite=Delete favorite
prev=Prev
next=Next
rename=Rename
overwrite=Overwrite
share_with_other_people=Share with other people
+sharing_settings=Sharing settings
can_view=Can view
can_edit_and_view=Can edit and view
none=None
@@ -36,11 +47,14 @@
selected=Selected
indicators=Indicators
all_indicator_groups=All indicator groups
+select_indicator_group=Select indicator group
data_elements=Data elements
all_data_element_groups=All data element groups
+select_data_element_group=Select data element group
data_sets=Data sets
reporting_rates=Reporting rates
periods=Periods
+select_period_type=Select period type
weeks=Weeks
last_week=Last week
last_4_weeks=Last 4 weeks
@@ -74,23 +88,20 @@
home=Home
data=Data
categories=Categories
+style=Style
+parameters=Parameters
+for_standard_reports_only=for standard reports only
please_create_a_table_first=Please create a table first
indicators_cannot_be_specified_as_filter=Indicators cannot be specified as filter
categories_cannot_be_specified_as_filter=Categories cannot be specified as filter
data_element_group_sets_cannot_be_specified_together_with_data_sets=Data element group sets cannot be specified together with data sets
at_least_one_dimension_must_be_specified_as_row_or_column=At least one dimension must be specified as row or column
at_least_one_period_must_be_specified_as_column_row_or_filter=At least one period must be specified as column, row or filter
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+example1=Creating a pivot table
+example2=Select items from any of the dimensions in the left menu
+example3=Click Layout to arrange your dimensions on table rows and columns
+example4=Click Update to create your table
+example5=Working with a pivot table
+example6=Click Options to hide sub-totals or empty rows, adjust font size and more
+example7=Click Favorites to save your table for later use
+example8=Click Download to save table data to your computer
=== 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 2013-04-17 11:52:56 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2013-04-17 12:44:45 +0000
@@ -738,7 +738,7 @@
bbar: [
'->',
{
- text: 'Hide',
+ text: PT.i18n.hide,
listeners: {
added: function(b) {
b.on('click', function() {
@@ -748,7 +748,7 @@
}
},
{
- text: '<b>Update</b>',
+ text: '<b>' + PT.i18n.update + '</b>',
listeners: {
added: function(b) {
b.on('click', function() {
@@ -824,9 +824,9 @@
store: Ext.create('Ext.data.Store', {
fields: ['id', 'text'],
data: [
- {id: 'comfortable', text: 'Comfortable'},
- {id: 'normal', text: 'Normal'},
- {id: 'compact', text: 'Compact'}
+ {id: 'comfortable', text: PT.i18n.comfortable},
+ {id: 'normal', text: PT.i18n.normal},
+ {id: 'compact', text: PT.i18n.compact}
]
})
});
@@ -846,9 +846,9 @@
store: Ext.create('Ext.data.Store', {
fields: ['id', 'text'],
data: [
- {id: 'large', text: 'Large'},
- {id: 'normal', text: 'Normal'},
- {id: 'small', text: 'Small'}
+ {id: 'large', text: PT.i18n.large},
+ {id: 'normal', text: PT.i18n.normal},
+ {id: 'small', text: PT.i18n.small_}
]
})
});
@@ -949,7 +949,7 @@
{
bodyStyle: 'border:0 none; color:#222; font-size:12px; font-weight:bold',
style: 'margin-bottom:6px',
- html: 'Data'
+ html: PT.i18n.data
},
data,
{
@@ -958,7 +958,7 @@
{
bodyStyle: 'border:0 none; color:#222; font-size:12px; font-weight:bold',
style: 'margin-bottom:6px',
- html: 'Style'
+ html: PT.i18n.style
},
style,
{
@@ -967,20 +967,20 @@
{
bodyStyle: 'border:0 none; color:#222; font-size:12px',
style: 'margin-bottom:6px',
- html: '<b>Parameters</b> <span style="font-size:11px"> (for standard reports only)</span>'
+ html: '<b>' + PT.i18n.parameters + '</b> <span style="font-size:11px"> (' + PT.i18n.for_standard_reports_only + ')</span>'
},
parameters
],
bbar: [
'->',
{
- text: 'Hide',
+ text: PT.i18n.hide,
handler: function() {
window.hide();
}
},
{
- text: '<b>Update</b>',
+ text: '<b>' + PT.i18n.update + '</b>',
handler: function() {
pt.viewport.updateViewport();
window.hide();
@@ -1424,7 +1424,7 @@
favorite;
if (record.data.access.update) {
- message = 'Overwrite favorite?\n\n' + record.data.name;
+ message = PT.i18n.overwrite_favorite + '?\n\n' + record.data.name;
favorite = getBody();
if (favorite) {
@@ -1485,7 +1485,7 @@
message;
if (record.data.access['delete']) {
- message = 'Delete favorite?\n\n' + record.data.name;
+ message = PT.i18n.delete_favorite + '?\n\n' + record.data.name;
if (confirm(message)) {
Ext.Ajax.request({
@@ -1599,7 +1599,7 @@
});
favoriteWindow = Ext.create('Ext.window.Window', {
- title: 'Manage favorites',
+ title: PT.i18n.manage_favorites,
//iconCls: 'pt-window-title-icon-favorite',
bodyStyle: 'padding:5px; background-color:#fff',
resizable: false,
@@ -1836,7 +1836,7 @@
}
window = Ext.create('Ext.window.Window', {
- title: 'Sharing settings',
+ title: PT.i18n.sharing_settings,
bodyStyle: 'padding:6px 6px 0px; background-color:#fff',
width: 434,
resizable: false,
@@ -1862,7 +1862,7 @@
bbar: [
'->',
{
- text: 'Save',
+ text: PT.i18n.save,
handler: function() {
Ext.Ajax.request({
url: pt.baseUrl + '/api/sharing?type=reportTable&id=' + sharing.object.id,
@@ -2054,7 +2054,7 @@
width: pt.conf.layout.west_fieldset_width - pt.conf.layout.west_width_padding,
valueField: 'id',
displayField: 'name',
- emptyText: 'Select indicator group',
+ emptyText: PT.i18n.select_indicator_group,
editable: false,
store: {
xtype: 'store',
@@ -2243,7 +2243,7 @@
width: pt.conf.layout.west_fieldset_width - pt.conf.layout.west_width_padding,
valueField: 'id',
displayField: 'name',
- emptyText: 'Select data element group',
+ emptyText: PT.i18n.select_data_element_group,
editable: false,
store: {
xtype: 'store',
@@ -2581,7 +2581,7 @@
},
{
xtype: 'checkbox',
- relativePeriodId: PT.i18n.last_bimonth,
+ relativePeriodId: 'LAST_BIMONTH',
boxLabel: PT.i18n.last_bimonth
},
{
@@ -2912,7 +2912,7 @@
width: pt.conf.layout.west_fieldset_width - pt.conf.layout.west_width_padding - 62 - 62 - 4,
valueField: 'id',
displayField: 'name',
- emptyText: 'Select period type',
+ emptyText: PT.i18n.select_period_type,
editable: false,
queryMode: 'remote',
store: pt.store.periodType,
@@ -3651,7 +3651,7 @@
}
},
{
- text: '<b>Update</b>',
+ text: '<b>' + PT.i18n.update + '</b>',
handler: function() {
update();
}
@@ -3705,14 +3705,14 @@
html = '';
html += '<div style="padding:20px">';
- html += '<div style="font-size:14px; padding-bottom:8px">Creating a pivot table</div>';
- html += '<div style="' + liStyle + '">- Select items from any of the dimensions in the left menu</div>';
- html += '<div style="' + liStyle + '">- Click "Layout" to arrange your dimensions on table rows and columns</div>';
- html += '<div style="' + liStyle + '">- Click "<b>Update</b>" to create your table</div>';
- html += '<div style="font-size:14px; padding-top:20px; padding-bottom:8px">Working with a pivot table</div>';
- html += '<div style="' + liStyle + '">- Click "Options" to hide sub-totals or empty rows, adjust font size and more</div>';
- html += '<div style="' + liStyle + '">- Click "Favorites" to save your table for later use</div>';
- html += '<div style="' + liStyle + '">- Click "Download" to save table data to your computer</div>';
+ html += '<div style="font-size:14px; padding-bottom:8px">' + PT.i18n.example1 + '</div>';
+ html += '<div style="' + liStyle + '">- ' + PT.i18n.example2 + '</div>';
+ html += '<div style="' + liStyle + '">- ' + PT.i18n.example3 + '</div>';
+ html += '<div style="' + liStyle + '">- ' + PT.i18n.example4 + '</div>';
+ html += '<div style="font-size:14px; padding-top:20px; padding-bottom:8px">' + PT.i18n.example5 + '</div>';
+ html += '<div style="' + liStyle + '">- ' + PT.i18n.example6 + '</div>';
+ html += '<div style="' + liStyle + '">- ' + PT.i18n.example7 + '</div>';
+ html += '<div style="' + liStyle + '">- ' + PT.i18n.example8 + '</div>';
html += '</div>';
p.update(html);
=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/i18n.vm'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/i18n.vm 2013-04-17 11:52:56 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/i18n.vm 2013-04-17 12:44:45 +0000
@@ -10,6 +10,11 @@
display_density: '$encoder.jsEscape($i18n.getString( 'display_density' ) , "'")',
font_size: '$encoder.jsEscape($i18n.getString( 'font_size' ) , "'")',
digit_group_separator: '$encoder.jsEscape($i18n.getString( 'digit_group_separator' ) , "'")',
+ comfortable: '$encoder.jsEscape($i18n.getString( 'comfortable' ) , "'")',
+ compact: '$encoder.jsEscape($i18n.getString( 'compact' ) , "'")',
+ large: '$encoder.jsEscape($i18n.getString( 'large' ) , "'")',
+ small_: '$encoder.jsEscape($i18n.getString( 'small_' ) , "'")',
+ normal: '$encoder.jsEscape($i18n.getString( 'normal' ) , "'")',
reporting_period: '$encoder.jsEscape($i18n.getString( 'reporting_period' ) , "'")',
organisation_unit: '$encoder.jsEscape($i18n.getString( 'organisation_unit' ) , "'")',
organisation_units: '$encoder.jsEscape($i18n.getString( 'organisation_units' ) , "'")',
@@ -20,14 +25,20 @@
create: '$encoder.jsEscape($i18n.getString( 'create' ) , "'")',
update: '$encoder.jsEscape($i18n.getString( 'update' ) , "'")',
cancel: '$encoder.jsEscape($i18n.getString( 'cancel' ) , "'")',
- delete_: '$encoder.jsEscape($i18n.getString( 'del' ) , "'")',
+ delete_: '$encoder.jsEscape($i18n.getString( 'delete_' ) , "'")',
+ save: '$encoder.jsEscape($i18n.getString( 'save' ) , "'")',
+ hide: '$encoder.jsEscape($i18n.getString( 'hide' ) , "'")',
add_new: '$encoder.jsEscape($i18n.getString( 'add_new' ) , "'")',
+ manage_favorites: '$encoder.jsEscape($i18n.getString( 'manage_favorites' ) , "'")',
search_for_favorites: '$encoder.jsEscape($i18n.getString( 'search_for_favorites' ) , "'")',
+ overwrite_favorite: '$encoder.jsEscape($i18n.getString( 'overwrite_favorite' ) , "'")',
+ delete_favorite: '$encoder.jsEscape($i18n.getString( 'delete_favorite' ) , "'")',
prev: '$encoder.jsEscape($i18n.getString( 'prev' ) , "'")',
next: '$encoder.jsEscape($i18n.getString( 'next' ) , "'")',
rename: '$encoder.jsEscape($i18n.getString( 'rename' ) , "'")',
overwrite: '$encoder.jsEscape($i18n.getString( 'overwrite' ) , "'")',
share_with_other_people: '$encoder.jsEscape($i18n.getString( 'share_with_other_people' ) , "'")',
+ sharing_settings: '$encoder.jsEscape($i18n.getString( 'sharing_settings' ) , "'")',
can_view: '$encoder.jsEscape($i18n.getString( 'can_view' ) , "'")',
can_edit_and_view: '$encoder.jsEscape($i18n.getString( 'can_edit_and_view' ) , "'")',
none: '$encoder.jsEscape($i18n.getString( 'none' ) , "'")',
@@ -37,11 +48,14 @@
selected: '$encoder.jsEscape($i18n.getString( 'selected' ) , "'")',
indicators: '$encoder.jsEscape($i18n.getString( 'indicators' ) , "'")',
all_indicator_groups: '$encoder.jsEscape($i18n.getString( 'all_indicator_groups' ) , "'")',
+ select_indicator_group: '$encoder.jsEscape($i18n.getString( 'select_indicator_group' ) , "'")',
data_elements: '$encoder.jsEscape($i18n.getString( 'data_elements' ) , "'")',
all_data_element_groups: '$encoder.jsEscape($i18n.getString( 'all_data_element_groups' ) , "'")',
+ select_data_element_group: '$encoder.jsEscape($i18n.getString( 'select_data_element_group' ) , "'")',
data_sets: '$encoder.jsEscape($i18n.getString( 'data_sets' ) , "'")',
reporting_rates: '$encoder.jsEscape($i18n.getString( 'reporting_rates' ) , "'")',
periods: '$encoder.jsEscape($i18n.getString( 'periods' ) , "'")',
+ select_period_type: '$encoder.jsEscape($i18n.getString( 'select_period_type' ) , "'")',
weeks: '$encoder.jsEscape($i18n.getString( 'weeks' ) , "'")',
last_week: '$encoder.jsEscape($i18n.getString( 'last_week' ) , "'")',
last_4_weeks: '$encoder.jsEscape($i18n.getString( 'last_4_weeks' ) , "'")',
@@ -73,11 +87,23 @@
chart: '$encoder.jsEscape($i18n.getString( 'chart' ) , "'")',
map: '$encoder.jsEscape($i18n.getString( 'map' ) , "'")',
home: '$encoder.jsEscape($i18n.getString( 'home' ) , "'")',
+ data: '$encoder.jsEscape($i18n.getString( 'data' ) , "'")',
categories: '$encoder.jsEscape($i18n.getString( 'categories' ) , "'")',
+ style: '$encoder.jsEscape($i18n.getString( 'style' ) , "'")',
+ parameters: '$encoder.jsEscape($i18n.getString( 'parameters' ) , "'")',
+ for_standard_reports_only: '$encoder.jsEscape($i18n.getString( 'for_standard_reports_only' ) , "'")',
please_create_a_table_first: '$encoder.jsEscape($i18n.getString( 'please_create_a_table_first' ) , "'")',
indicators_cannot_be_specified_as_filter: '$encoder.jsEscape($i18n.getString( 'indicators_cannot_be_specified_as_filter' ) , "'")',
categories_cannot_be_specified_as_filter: '$encoder.jsEscape($i18n.getString( 'categories_cannot_be_specified_as_filter' ) , "'")',
data_element_group_sets_cannot_be_specified_together_with_data_sets: '$encoder.jsEscape($i18n.getString( 'data_element_group_sets_cannot_be_specified_together_with_data_sets' ) , "'")',
at_least_one_dimension_must_be_specified_as_row_or_column: '$encoder.jsEscape($i18n.getString( 'at_least_one_dimension_must_be_specified_as_row_or_column' ) , "'")',
- at_least_one_period_must_be_specified_as_column_row_or_filter: '$encoder.jsEscape($i18n.getString( 'at_least_one_period_must_be_specified_as_column_row_or_filter' ) , "'")'
+ at_least_one_period_must_be_specified_as_column_row_or_filter: '$encoder.jsEscape($i18n.getString( 'at_least_one_period_must_be_specified_as_column_row_or_filter' ) , "'")',
+ example1: '$encoder.jsEscape($i18n.getString( 'example1' ) , "'")',
+ example2: '$encoder.jsEscape($i18n.getString( 'example2' ) , "'")',
+ example3: '$encoder.jsEscape($i18n.getString( 'example3' ) , "'")',
+ example4: '$encoder.jsEscape($i18n.getString( 'example4' ) , "'")',
+ example5: '$encoder.jsEscape($i18n.getString( 'example5' ) , "'")',
+ example6: '$encoder.jsEscape($i18n.getString( 'example6' ) , "'")',
+ example7: '$encoder.jsEscape($i18n.getString( 'example7' ) , "'")',
+ example8: '$encoder.jsEscape($i18n.getString( 'example8' ) , "'")'
};
