Skip to content

Commit

Permalink
Generalise indian number format for country=India (languages: English…
Browse files Browse the repository at this point in the history
…, Hindi, Marathi, etc.). Minor improvements in Spanish translation.

git-svn-id: http://svn.code.sf.net/p/web-erp/code/trunk@7094 09516a42-71f9-43be-811f-9b821cf0d246
  • Loading branch information
rchacon committed Jan 23, 2015
1 parent 78f126e commit 4447407
Show file tree
Hide file tree
Showing 7 changed files with 869 additions and 849 deletions.
2 changes: 2 additions & 0 deletions doc/Change.log
@@ -1,5 +1,7 @@
webERP Change Log

23/01/15 RChacon: Generalise indian number format for country=India (languages: English, Hindi, Marathi, etc.).
Add translation for transaction type, script ID, manual references, class="number" to columns.
20/01/15 RChacon: Add translation for transaction type, script ID, manual references, class="number" to columns.
20/1/15 Exson: Remove die() function from Suppliers.php which will make adding or updating suppliers' data failed when google map is activated. Reported by Terry.
17/01/15 RChacon: Fix Czech language code, add info for Croatian language, add the script name and revision number and sort by language code.
Expand Down
2 changes: 1 addition & 1 deletion doc/Manual/ManualMultilanguage.html
Expand Up @@ -74,7 +74,7 @@ <h2>The .po File Header</h2>

<h4>The .po file starts with some initial comments which should also be completed</h4>

<p>"SOME DESCRIPTIVE TITLE", - should be replaced with webERP - LANGUAGE Translation File - where LANGUAGE is the language being translated into<br>
<p>"SOME DESCRIPTIVE TITLE", - should be replaced with <b><i>webERP - LANGUAGE Translation File</i></b> - where LANGUAGE is the language being translated into<br>
# FIRST AUTHOR , YEAR. - should be your name and email address - with the year of the work being done</p>

<h4>Project-Id-Version</h4>
Expand Down
6 changes: 4 additions & 2 deletions includes/MiscFunctions.php
Expand Up @@ -333,7 +333,8 @@ function http_file_exists($url) {
function locale_number_format($Number, $DecimalPlaces=0) {
global $DecimalPoint;
global $ThousandsSeparator;
if ($_SESSION['Language']=='hi_IN.utf8' OR $_SESSION['Language']=='en_IN.utf8'){
/* if ($_SESSION['Language']=='hi_IN.utf8' OR $_SESSION['Language']=='en_IN.utf8'){*/
if(substr($_SESSION['Language'], 3, 2)=='IN') {// If country is India (??_IN.utf8).
return indian_number_format(floatval($Number),$DecimalPlaces);
} else {
if (!is_numeric($DecimalPlaces) AND $DecimalPlaces == 'Variable'){
Expand Down Expand Up @@ -400,6 +401,7 @@ function indian_number_format($Number,$DecimalPlaces){
return $IntegerNumber. $DecimalValue;
}
}

function SendMailBySmtp(&$mail,$To) {
if(IsEmailAddress($_SESSION['SMTPSettings']['username'])){//user has set the fully mail address as user name
$SendFrom = $_SESSION['SMTPSettings']['username'];
Expand Down Expand Up @@ -450,4 +452,4 @@ function ChangeFieldInTable($TableName, $FieldName, $OldValue, $NewValue, $db){
echo ' ... ' . _('completed');
}

?>
?>
Binary file modified locale/es_ES.utf8/LC_MESSAGES/messages.mo
Binary file not shown.
882 changes: 445 additions & 437 deletions locale/es_ES.utf8/LC_MESSAGES/messages.po

Large diffs are not rendered by default.

Binary file modified locale/fr_FR.utf8/LC_MESSAGES/messages.mo
Binary file not shown.
826 changes: 417 additions & 409 deletions locale/fr_FR.utf8/LC_MESSAGES/messages.po

Large diffs are not rendered by default.

0 comments on commit 4447407

Please sign in to comment.