[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4042: i18n fix.

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)

revision-diff.txt (4.81 KB)

···

------------------------------------------------------------
revno: 4042 [merge]
committer: Jan Henrik Overland <janhenrik.overland@gmail.com>
branch nick: dhis2
timestamp: Thu 2011-06-30 11:48:06 +0300
message:
  i18n fix.
modified:
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importForm.vm
  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/javascript/index.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

Additional commit message:

Import form submit button text now reflects the selected import type.

···

On Thu, Jun 30, 2011 at 11:51, noreply@launchpad.net wrote:

Merge authors:

Jan Henrik Øverland (janhenrik-overland)


revno: 4042 [merge]

committer: Jan Henrik Overland janhenrik.overland@gmail.com

branch nick: dhis2

timestamp: Thu 2011-06-30 11:48:06 +0300

message:

i18n fix.

modified:

dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importForm.vm

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/javascript/index.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-importexport/src/main/webapp/dhis-web-importexport/importForm.vm’

— dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importForm.vm 2011-03-28 14:39:48 +0000

+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importForm.vm 2011-06-27 10:30:38 +0000

@@ -1,6 +1,8 @@

$i18n.getString( "$importFormat" ) $i18n.getString( "import" ) #openHelp( "import" )

@@ -125,7 +131,7 @@

    <tr>

            <td colspan="2">
  •                   <input type="button" value="$i18n.getString( 'import' )" onclick="submitImportForm()" style="width:50%"><input
    
  •                   <input id="submit" type="button" value="$i18n.getString( 'import' )" onclick="submitImportForm()" style="width:50%"><input
    
                              type="button" id="optionButton" value="$i18n.getString( 'show_advanced_options' )" onclick="showAdvancedOptions()" style="width:50%">
    
    
    
              </td>
    
      </tr>
    

=== 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-26 06:49:46 +0000

+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties 2011-06-30 08:39:32 +0000

@@ -286,7 +286,7 @@

export_image = Export image

export_thematic_map_to_png = Export thematic map to PNG

total_distance = Total distance

-legend = legend

+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-26 06:49:46 +0000

+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm 2011-06-30 08:39:32 +0000

@@ -297,7 +297,7 @@

 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’ ) , "’")’,
  • 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’ ) , "’")’

=== 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 19:16:44 +0000

+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js 2011-06-30 08:39:32 +0000

@@ -606,7 +606,7 @@

                 {

                     xtype: 'checkbox',

                     id: 'exportimageincludelegend_chb',
  •                    fieldLabel: G.i18n.legend,
    
  •                    fieldLabel: G.i18n.legend_,
    
                       labelSeparator: '',
    
                       isFormField: true,
    
                       checked: true
    

@@ -728,7 +728,7 @@

     items: [

         {

             id: 'newpredefinedmaplegend_p',
  •            title: G.i18n.legend,
    
  •            title: G.i18n.legend_,
    
               items: [
    
                   {
    
                       xtype: 'form',
    

@@ -784,7 +784,7 @@

                             selectOnFocus: true,

                             emptyText: G.conf.emptytext,

                             labelSeparator: G.conf.labelseparator,
  •                            fieldLabel: G.i18n.legend,
    
  •                            fieldLabel: G.i18n.legend_,
    
                               width: G.conf.combo_width_fieldset,
    
                               minListWidth: G.conf.combo_width_fieldset,
    
                               store: G.stores.predefinedMapLegend
    

Mailing list: https://launchpad.net/~dhis2-devs

Post to : dhis2-devs@lists.launchpad.net

Unsubscribe : https://launchpad.net/~dhis2-devs

More help : https://help.launchpad.net/ListHelp