Fwd: [Web-erp-svn] SF.net SVN: web-erp:[7679] trunk

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Fwd: [Web-erp-svn] SF.net SVN: web-erp:[7679] trunk

Rafael Chacón
Hi, I am back,

Thanks Tim for the remark. 

The use of colon (the ":" character) at the end of a "compound text" could generate problems. This problem is due of the proper punctuation use in other languages (e.g. in French, it is rqthe use of a non-breaking space before the colon).

I was reducing the *.PO files (and consequently the *.MO files). To do this, I use the most common for similar texts. In our software is more frequent the use of a text without colon than with colon (e.g. "title" vs. "title:"). To respect the current appearance, I maintained the use of colon. The next step is to standardise the use of texts inside the code.

In general, it is recommended to use a single text instead of a compound text (e.g. "GL account" vs "GL"." "."account") to avoid problems in traslation.

Best regards, Rafael.

---------- Forwarded message ----------
From: Tim Schofield <[hidden email]>
Date: 2016-11-28 10:25 GMT-06:00
Subject: Re: [Web-erp-svn] SF.net SVN: web-erp:[7679] trunk
To: Rafael Emilio Chacon <[hidden email]>


Hi Rafael,

I have a feeling (though I may be wrong) that the character we use for
':' is different in some character sets (Arabic for instance) and that
was why it was within the _() function.

It is a really minor point I know.

Congrats on becoming a project admin :)
Tim

On 23 November 2016 at 19:08,  <[hidden email]> wrote:
> Revision: 7679
>           http://sourceforge.net/p/web-erp/reponame/7679
> Author:   rchacon
> Date:     2016-11-23 19:08:09 +0000 (Wed, 23 Nov 2016)
> Log Message:
> -----------
> Removes ':' from text.
>
> Modified Paths:
> --------------
>     trunk/BOMIndented.php
>     trunk/MaintenanceReminders.php
>     trunk/PDFStockCheckComparison.php
>     trunk/PcReportTab.php
>     trunk/SuppPriceList.php
>     trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
>     trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
>
> Modified: trunk/BOMIndented.php
> ===================================================================
> --- trunk/BOMIndented.php       2016-11-23 17:15:37 UTC (rev 7678)
> +++ trunk/BOMIndented.php       2016-11-23 19:08:09 UTC (rev 7679)
> @@ -1,6 +1,6 @@
>  <?php
> -
>  /* $Id$*/
> +/* Shows the bill of material indented for each level */
>
>  // BOMIndented.php - Indented Bill of Materials
>
> @@ -323,7 +323,7 @@
>         $FontSize=8;
>         $YPos =$YPos - (2*$line_height);
>
> -       $pdf->addTextWrap($Left_Margin+1,$YPos,40,$FontSize,_('Assembly:'),'',0);
> +       $pdf->addTextWrap($Left_Margin+1,$YPos,40,$FontSize,_('Assembly').':','',0);
>         $pdf->addTextWrap(85,$YPos,100,$FontSize,mb_strtoupper($_POST['Part']),'',0);
>         $pdf->addTextWrap(185,$YPos,150,$FontSize,$assemblydesc,'',0);
>         $YPos -=(2*$line_height);
>
> Modified: trunk/MaintenanceReminders.php
> ===================================================================
> --- trunk/MaintenanceReminders.php      2016-11-23 17:15:37 UTC (rev 7678)
> +++ trunk/MaintenanceReminders.php      2016-11-23 19:08:09 UTC (rev 7679)
> @@ -34,7 +34,7 @@
>                 ${'Mail' . $myrow['userresponsible']}->setSubject('Maintenance Tasks Reminder');
>                 ${'Mail' . $myrow['userresponsible']}->setFrom('Do_not_reply <>');
>         }
> -       $MailText .=  "Asset: " . $myrow['description'] . "\nTask: " . $myrow['taskdescription'] . "\nDue: " . ConvertSQLDate($myrow['duedate']);
> +       $MailText .= 'Asset' . ': ' . $myrow['description'] . "\nTask: " . $myrow['taskdescription'] . "\nDue: " . ConvertSQLDate($myrow['duedate']);
>         if (Date1GreaterThanDate2(ConvertSQLDate($myrow['duedate']),Date($_SESSION['DefaultDateFormat']))) {
>                 $MailText .= _('NB: THIS JOB IS OVERDUE');
>         }
> @@ -74,7 +74,7 @@
>                 ${'Mail' . $myrow['manager']}->setSubject('Overdue Maintenance Tasks Reminder');
>                 ${'Mail' . $myrow['manager']}->setFrom('Do_not_reply <>');
>         }
> -       $MailText .=  _('Asset:') .' ' . $myrow['description'] . "\n" . _('Task:') . ' ' . $myrow['taskdescription'] . "\n" . _('Due:') . ' ' . ConvertSQLDate($myrow['duedate']);
> +       $MailText .= _('Asset') . ': ' . $myrow['description'] . "\n" . _('Task:') . ' ' . $myrow['taskdescription'] . "\n" . _('Due:') . ' ' . ConvertSQLDate($myrow['duedate']);
>         $MailText . "\n\n";
>  }
>  if (DB_num_rows($result)>0){
>
> Modified: trunk/PDFStockCheckComparison.php
> ===================================================================
> --- trunk/PDFStockCheckComparison.php   2016-11-23 17:15:37 UTC (rev 7678)
> +++ trunk/PDFStockCheckComparison.php   2016-11-23 19:08:09 UTC (rev 7679)
> @@ -1,6 +1,6 @@
>  <?php
> -
>  /* $Id$*/
> +/* Creates a pdf comparing the quantites entered as counted at a given range of locations against the quantity stored as on hand as at the time a stock check was initiated. */
>
>  include('includes/session.inc');
>
> @@ -219,7 +219,7 @@
>         $FirstRow = DB_fetch_array($CheckedItems);
>         $LocationName = $FirstRow['locationname'];
>         DB_data_seek($CheckedItems,0);
> -
> +
>         include ('includes/PDFStockComparisonPageHeader.inc');
>
>         $Location = '';
> @@ -254,7 +254,7 @@
>                         $YPos -=$line_height;
>                 }
>
> -
> +
>                 $SQL = "SELECT qtycounted,
>                                                 reference
>                                 FROM stockcounts
> @@ -279,7 +279,7 @@
>                         $YPos -=$line_height;
>                         $FontSize=8;
>                         if (mb_strlen($CheckItemRow['bin'])>0){
> -                               $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,120,$FontSize,$CheckItemRow['stockid'] . ' - ' . _('Bin:') . $CheckItemRow['bin'], 'left');
> +                               $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,120,$FontSize,$CheckItemRow['stockid'] . ' - ' . _('Bin') . ':' . $CheckItemRow['bin'], 'left');
>                         } else {
>                                 $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,120,$FontSize,$CheckItemRow['stockid'], 'left');
>                         }
>
> Modified: trunk/PcReportTab.php
> ===================================================================
> --- trunk/PcReportTab.php       2016-11-23 17:15:37 UTC (rev 7678)
> +++ trunk/PcReportTab.php       2016-11-23 19:08:09 UTC (rev 7679)
> @@ -1,11 +1,14 @@
>  <?php
> -
>  /* $Id$ */
> +/*  */
>
>  include ('includes/session.inc');
> +$Title = _('Petty Cash Management Report');
> +$ViewTopic = 'PettyCash';
> +$BookMark = 'PcReportTab';
> +
>  include ('includes/SQL_CommonFunctions.inc');
>
> -$Title = _('Petty Cash Management Report');
>
>  if (isset($_POST['SelectedTabs'])){
>         $SelectedTabs = mb_strtoupper($_POST['SelectedTabs']);
> @@ -13,7 +16,7 @@
>         $SelectedTabs = mb_strtoupper($_GET['SelectedTabs']);
>  }
>
> -if ((! isset($_POST['FromDate']) AND ! isset($_POST['ToDate'])) OR isset($_POST['SelectDifferentDate'])){
> +if ((! isset($_POST['FromDate']) AND ! isset($_POST['ToDate'])) OR isset($_POST['SelectDifferentDate'])) {
>
>         include  ('includes/header.inc');
>
> @@ -78,7 +81,7 @@
>                 </div>
>         </form>';
>
> -} else if (isset($_POST['PrintPDF'])) {
> +} elseif (isset($_POST['PrintPDF'])) {
>
>         include('includes/PDFStarter.php');
>         $PageNumber = 0;
> @@ -138,34 +141,34 @@
>
>         $YPos -= (2 * $line_height);
>         $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Tab Code :'));
> -       $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,_(': '));
> +       $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,': ');
>         $LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,$SelectedTabs);
>         $LeftOvers = $pdf->addTextWrap($Left_Margin+290,$YPos,70,$FontSize,_('From'). ' ');
> -       $LeftOvers = $pdf->addTextWrap($Left_Margin+320,$YPos,20,$FontSize,_(': '));
> +       $LeftOvers = $pdf->addTextWrap($Left_Margin+320,$YPos,20,$FontSize,': ');
>         $LeftOvers = $pdf->addTextWrap($Left_Margin+340,$YPos,70,$FontSize,$_POST['FromDate']);
>
>         $YPos -= $line_height;
>         $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('User '));
> -       $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,_(': '));
> +       $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,': ');
>         $LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,$Tabs['usercode']);
>         $LeftOvers = $pdf->addTextWrap($Left_Margin+290,$YPos,70,$FontSize,_('To '));
> -       $LeftOvers = $pdf->addTextWrap($Left_Margin+320,$YPos,20,$FontSize,_(': '));
> +       $LeftOvers = $pdf->addTextWrap($Left_Margin+320,$YPos,20,$FontSize,': ');
>         $LeftOvers = $pdf->addTextWrap($Left_Margin+340,$YPos,70,$FontSize,$_POST['ToDate']);
>
>         $YPos -= $line_height;
>         $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Authoriser '));
> -       $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,_(': '));
> +       $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,': ');
>         $LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,$Tabs['authorizer']);
>
>         $YPos -= $line_height;
>         $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Currency '));
> -       $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,_(': '));
> +       $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,': ');
>         $LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,$Tabs['currency']);
>
>         $YPos -= $line_height;
>         $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,40,$FontSize,_('Balance before '));
>         $LeftOvers = $pdf->addTextWrap($Left_Margin+55,$YPos,70,$FontSize,$_POST['FromDate']);
> -       $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,_(': '));
> +       $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,': ');
>         $LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,locale_number_format($Balance['0'],$_SESSION['CompanyRecord']['decimalplaces']));
>         $LeftOvers = $pdf->addTextWrap($Left_Margin+150,$YPos,70,$FontSize,$Tabs['currency']);
>
> @@ -222,7 +225,7 @@
>         $pdf->line($Left_Margin+250, $YPos+$line_height,$Left_Margin+500, $YPos+$line_height);
>         $LeftOvers = $pdf->addTextWrap($Left_Margin+70,$YPos,100,$FontSize,_('Balance at'));
>         $LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,$_POST['ToDate']);
> -       $LeftOvers = $pdf->addTextWrap($Left_Margin+160,$YPos,20,$FontSize,_(': '));
> +       $LeftOvers = $pdf->addTextWrap($Left_Margin+160,$YPos,20,$FontSize,': ');
>         $LeftOvers = $pdf->addTextWrap($Left_Margin+160,$YPos,70,$FontSize,locale_number_format($Amount[0],$_SESSION['CompanyRecord']['decimalplaces']),'right');
>         $LeftOvers = $pdf->addTextWrap($Left_Margin+240,$YPos,70,$FontSize,$Tabs['currency']);
>         $pdf->line($Page_Width-$Right_Margin, $YPos+$line_height,$Left_Margin, $YPos+$line_height);
>
> Modified: trunk/SuppPriceList.php
> ===================================================================
> --- trunk/SuppPriceList.php     2016-11-23 17:15:37 UTC (rev 7678)
> +++ trunk/SuppPriceList.php     2016-11-23 19:08:09 UTC (rev 7679)
> @@ -1,6 +1,6 @@
>  <?php
> -
>  /* $Id$*/
> +/*  */
>
>  include('includes/session.inc');
>
> @@ -246,7 +246,6 @@
>         }
>         echo '</select></td>
>                 </tr>';
> -
>         echo '<tr>
>                         <td>' . _('Price List') . ':</td>
>                         <td><select name="price">
> @@ -255,8 +254,6 @@
>                                 </select>
>                         </td>
>                 </tr>';
> -
> -
>         echo '</table>
>                         <br/>
>                         <div class="centre">
> @@ -293,15 +290,15 @@
>                  Date($_SESSION['DefaultDateFormat']) . '   ' . _('Page') . ' ' . $PageNumber,'left');
>         $YPos -= $line_height;
>         $pdf->addTextWrap($Left_Margin,$YPos,50,$FontSize,_('Supplier').'   ');
> -       $pdf->addTextWrap(95,$YPos,150,$FontSize,_(': ').$SupplierName);
> +       $pdf->addTextWrap(95,$YPos,150,$FontSize,': '.$SupplierName);
>
>         $YPos -= $line_height;
>         $pdf->addTextWrap($Left_Margin,$YPos,50,$FontSize,_('Category').' ');
>
> -       $pdf->addTextWrap(95,$YPos,150,$FontSize,_(': ').$Categoryname);
> +       $pdf->addTextWrap(95,$YPos,150,$FontSize,': '.$Categoryname);
>         $YPos -= $line_height;
>         $pdf->addTextWrap($Left_Margin,$YPos,50,$FontSize,_('Currency').'  ');
> -       $pdf->addTextWrap(95,$YPos,50,$FontSize,_(': ').$CurrCode);
> +       $pdf->addTextWrap(95,$YPos,50,$FontSize,': '.$CurrCode);
>         $YPos -=(2*$line_height);
>         /*set up the headings */
>
>
> Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
> ===================================================================
> (Binary files differ)
>
> Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
> ===================================================================
> --- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po     2016-11-23 17:15:37 UTC (rev 7678)
> +++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po     2016-11-23 19:08:09 UTC (rev 7679)
> @@ -8,7 +8,7 @@
>  "Project-Id-Version: webERP 4.12.2\n"
>  "Report-Msgid-Bugs-To: \n"
>  "POT-Creation-Date: 2016-11-20 17:14-0600\n"
> -"PO-Revision-Date: 2016-11-23 08:21-0600\n"
> +"PO-Revision-Date: 2016-11-23 13:05-0600\n"
>  "Last-Translator: Rafael E. Chacón <[hidden email]>\n"
>  "Language-Team: TecnoSoluciones.com <[hidden email]>\n"
>  "Language: es_ES\n"
> @@ -23793,7 +23793,7 @@
>  #: PcReportTab.php:168 PcReportTab.php:225 SuppPriceList.php:296
>  #: SuppPriceList.php:301 SuppPriceList.php:304
>  msgid ": "
> -msgstr ":"
> +msgstr ": "
>
>  #: PcReportTab.php:148
>  msgid "User "
>
>
> ------------------------------------------------------------------------------
> _______________________________________________
> Web-erp-svn mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/web-erp-svn



--
Course View Towers,
Plot 21 Yusuf Lule Road,
Kampala
T   <a href="tel:%2B256%20%280%29%20312%20314%20418" value="+256312314418">+256 (0) 312 314 418
M <a href="tel:%2B256%20%280%29%20752%20963%20325" value="+256752963325">+256 (0) 752 963 325
www.weberpafrica.com
Twitter: @TimSchofield2
Blog: http://weberpafrica.blogspot.co.uk/


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Web-erp-developers mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/web-erp-developers