SF.net SVN: ledger-smb:[6884] branches/1.3/bin/am.pl

[..hidden..]

Revision: 6884
          http://sourceforge.net/p/ledger-smb/code/6884
Author:   pongracz
Date:     2014-02-21 19:21:28 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
Translation fix. Now messages translated in two steps: first build the final message in English and second, translate that one. Somehow the old code simply did not work as expected. I checked a relevant and working part and rewrited the problematic code. Now it seems working, one need to check *.po to contain all messages.

Modified Paths:
--------------
    branches/1.3/bin/am.pl

Property Changed:
----------------
    branches/1.3/bin/am.pl

Modified: branches/1.3/bin/am.pl
===================================================================
--- branches/1.3/bin/am.pl	2014-02-20 12:48:20 UTC (rev 6883)
+++ branches/1.3/bin/am.pl	2014-02-21 19:21:28 UTC (rev 6884)
@@ -405,7 +405,7 @@
 sub csv_list_gifi { &list_gifi }
 
 sub add_gifi {
-    $form->{title} = $locale->text("Add");
+    $form->{title} = "Add";
 
     # construct callback
     $form->{callback} =
@@ -458,8 +458,9 @@
 
 sub gifi_header {
     my $hiddens = shift;
+    my $title_msg="$form->{title} GIFI";
 
-    $form->{title} = $locale->text("[_1] GIFI", $form->{title});
+    $form->{title} = $locale->text($title_msg);
 
     # $locale->text('Add GIFI')
     # $locale->text('Edit GIFI')
@@ -561,7 +562,7 @@
 
 sub add_department {
 
-    $form->{title} = $locale->text("Add");
+    $form->{title} = "Add";
     $form->{role}  = "P";
 
     $form->{callback} =
@@ -686,8 +687,9 @@
 
 sub department_header {
     my $hiddens = shift;
+    my $title_msg="$form->{title} Department";
 
-    $form->{title} = $locale->text("[_1] Department", $form->{title});
+    $form->{title} = $locale->text($title_msg);
 
     # $locale->text('Add Department')
     # $locale->text('Edit Department')
@@ -719,7 +721,7 @@
 
 sub add_business {
 
-    $form->{title} = $locale->text("Add");
+    $form->{title} = "Add";
 
     $form->{callback} =
 "$form->{script}?action=add_business&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}"
@@ -841,8 +843,9 @@
 
 sub business_header {
     my $hiddens = shift;
+    my $title_msg="$form->{title} Business";
 
-    $form->{title} = $locale->text("[_1] Business", $form->{title});
+    $form->{title} = $locale->text($title_msg);
 
     # $locale->text('Add Business')
     # $locale->text('Edit Business')
@@ -873,7 +876,7 @@
 
 sub add_sic {
 
-    $form->{title} = $locale->text("Add");
+    $form->{title} = "Add";
 
     $form->{callback} =
 "$form->{script}?action=add_sic&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}"
@@ -1008,8 +1011,9 @@
 
 sub sic_header {
     my $hiddens = shift;
+    my $title_msg="$form->{title} SIC";
 
-    $form->{title} = $locale->text("[_1] SIC", $form->{title});
+    $form->{title} = $locale->text($title_msg);
 
     # $locale->text('Add SIC')
     # $locale->text('Edit SIC')
@@ -1042,7 +1046,7 @@
 
 sub add_language {
 
-    $form->{title} = $locale->text("Add");
+    $form->{title} = "Add";
 
     $form->{callback} =
 "$form->{script}?action=add_language&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}"
@@ -1171,8 +1175,9 @@
 
 sub language_header {
     my $hiddens = shift;
+    my $title_msg="$form->{title} Language";
 
-    $form->{title} = $locale->text("[_1] Language", $form->{title});
+    $form->{title} = $locale->text($title_msg);
 
     # $locale->text('Add Language')
     # $locale->text('Edit Language')
@@ -1896,7 +1901,7 @@
 
 sub add_warehouse {
 
-    $form->{title} = $locale->text("Add");
+    $form->{title} = "Add";
 
     $form->{callback} =
 "$form->{script}?action=add_warehouse&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}"
@@ -2019,8 +2024,9 @@
 
 sub warehouse_header {
     my $hiddens = shift;
+    my $title_msg="$form->{title} Warehouse";
 
-    $form->{title} = $locale->text("[_1] Warehouse", $form->{title});
+    $form->{title} = $locale->text($title_msg);
 
     # $locale->text('Add Warehouse')
     # $locale->text('Edit Warehouse')


Property changes on: branches/1.3/bin/am.pl
___________________________________________________________________
Modified: svn:text-time
## -1 +1 ##
-2014-02-06T19:29:37.000000Z
+2014-02-21T19:15:35.986902Z
\ No newline at end of property
Modified: svn:owner
## -1 +1 ##
-33 www-data
+0 root
\ No newline at end of property
Modified: svn:group
## -1 +1 ##
-33 www-data
+0 root
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121054471&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits