lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for rtl languages

Browse Source
This commit is contained in:
Laurent Destailleur 2017-01-21 16:12:25 +01:00
parent f03ad00466
commit 3a2d9c8610
6 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/core/class/translate.class.php
View File

@ -29,17 +29,16 @@
*/ */
class Translate class Translate
{ {
var $dir; // Directories that contains /langs subdirectory public $dir; // Directories that contains /langs subdirectory
var $defaultlang; // Current language for current user public $defaultlang; // Current language for current user
var $direction = 'ltr'; // Left to right or Right to left public $charset_output='UTF-8'; // Codage used by "trans" method outputs
var $charset_output='UTF-8'; // Codage used by "trans" method outputs
var $tab_translate=array(); // Array of all translations key=>value public $tab_translate=array(); // Array of all translations key=>value
private $_tab_loaded=array(); // Array to store result after loading each language file private $_tab_loaded=array(); // Array to store result after loading each language file
var $cache_labels=array(); // Cache for labels return by getLabelFromKey method public $cache_labels=array(); // Cache for labels return by getLabelFromKey method
var $cache_currencies=array(); // Cache to store currency symbols public $cache_currencies=array(); // Cache to store currency symbols

2
htdocs/core/lib/functions.lib.php
View File

@ -2504,7 +2504,7 @@ function img_edit($titlealt = 'default', $float = 0, $other = '')
if ($titlealt == 'default') $titlealt = $langs->trans('Modify'); if ($titlealt == 'default') $titlealt = $langs->trans('Modify');
return img_picto($titlealt, 'edit.png', ($float ? 'style="float: right"' : $other)); return img_picto($titlealt, 'edit.png', ($float ? 'style="float: '.($langs->tab_translate["DIRECTION"] == 'rtl'?'left':'right').'"' : $other));
} }
/** /**

2
htdocs/societe/soc.php
View File

@ -2239,7 +2239,7 @@ else
print '<table width="100%" class="nobordernopadding"><tr><td>'; print '<table width="100%" class="nobordernopadding"><tr><td>';
print $langs->trans('IncotermLabel'); print $langs->trans('IncotermLabel');
print '<td><td align="right">'; print '<td><td align="right">';
if ($user->rights->societe->creer) print '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$object->id.'&action=editincoterm">'.img_edit().'</a>'; if ($user->rights->societe->creer) print '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$object->id.'&action=editincoterm">'.img_edit('',1).'</a>';
else print '&nbsp;'; else print '&nbsp;';
print '</td></tr></table>'; print '</td></tr></table>';
print '</td>'; print '</td>';

2
htdocs/societe/tpl/linesalesrepresentative.tpl.php
View File

@ -5,7 +5,7 @@
print $langs->trans('SalesRepresentatives'); print $langs->trans('SalesRepresentatives');
print '<td><td align="right">'; print '<td><td align="right">';
if ($user->rights->societe->creer && $user->rights->societe->client->voir) if ($user->rights->societe->creer && $user->rights->societe->client->voir)
print '<a href="'.DOL_URL_ROOT.'/societe/commerciaux.php?socid='.$object->id.'">'.img_edit().'</a>'; print '<a href="'.DOL_URL_ROOT.'/societe/commerciaux.php?socid='.$object->id.'">'.img_edit('',1).'</a>';
else else
print '&nbsp;'; print '&nbsp;';
print '</td></tr></table>'; print '</td></tr></table>';

8
htdocs/theme/eldy/style.css.php
View File

@ -1244,10 +1244,10 @@ div.menu_titre {
.mainmenuaspan .mainmenuaspan
{ {
<?php if ($disableimages) { ?> <?php if ($disableimages) { ?>
padding-left: 4px; padding-<?php print $left; ?>: 4px;
padding-right: 2px; padding-<?php print $right; ?>: 2px;
<?php } else { ?> <?php } else { ?>
padding-right: 4px; padding-<?php print $right; ?>: 4px;
<?php } ?> <?php } ?>
} }
@ -2056,7 +2056,7 @@ a.tabTitle {
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
font-weight: normal !important; font-weight: normal !important;
padding: 4px 6px 2px 0px; padding: 4px 6px 2px 0px;
margin-right: 10px; margin-<?php print $right; ?>: 10px;
text-decoration: none; text-decoration: none;
white-space: nowrap; white-space: nowrap;
} }

8
htdocs/theme/md/style.css.php
View File

@ -1254,10 +1254,10 @@ div.menu_titre {
.mainmenuaspan .mainmenuaspan
{ {
<?php if ($disableimages) { ?> <?php if ($disableimages) { ?>
padding-left: 4px; padding-<?php print $left; ?>: 4px;
padding-right: 2px; padding-<?php print $right; ?>: 2px;
<?php } else { ?> <?php } else { ?>
padding-right: 4px; padding-<?php print $right; ?>: 4px;
<?php } ?> <?php } ?>
} }
@ -2042,7 +2042,7 @@ a.tabTitle {
/* background: #657090; /* background: #657090;
color: white;*/ color: white;*/
color:rgba(0,0,0,.5); color:rgba(0,0,0,.5);
margin-right:10px; margin-<?php print $right; ?>: 10px;
text-shadow:1px 1px 1px #ffffff; text-shadow:1px 1px 1px #ffffff;
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
font-weight: normal; font-weight: normal;