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

Reduce need of translations

Browse Source
This commit is contained in:
Laurent Destailleur 2019-11-12 22:29:36 +01:00
parent 89bf35a8bf
commit 56c2dc2614
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/class/html.formwebsite.class.php
View File

@ -228,9 +228,10 @@ class FormWebsite
* @param int $pageid Preselected container ID * @param int $pageid Preselected container ID
* @param int $showempty Show empty record * @param int $showempty Show empty record
* @param string $action Action on page that use this select list * @param string $action Action on page that use this select list
* @param string $morecss More CSS
* @return string HTML select component with list of type of containers * @return string HTML select component with list of type of containers
*/ */
public function selectContainer($website, $htmlname = 'pageid', $pageid = 0, $showempty = 0, $action = '') public function selectContainer($website, $htmlname = 'pageid', $pageid = 0, $showempty = 0, $action = '', $morecss = 'minwidth200')
{ {
global $langs; global $langs;
@ -239,11 +240,11 @@ class FormWebsite
$out=''; $out='';
if ($atleastonepage && $action != 'editsource') if ($atleastonepage && $action != 'editsource')
{ {
$out.='<select name="'.$htmlname.'" id="'.$htmlname.'" class="minwidth200 maxwidth300">'; $out.='<select name="'.$htmlname.'" id="'.$htmlname.'" class="maxwidth300'.($morecss ? ' '.$morecss : '').'">';
} }
else else
{ {
$out.='<select name="pageidbis" id="pageid" class="minwidth200 maxwidth300" disabled="disabled">'; $out.='<select name="pageidbis" id="pageid" class="maxwidth300'.($morecss ? ' '.$morecss : '').'" disabled="disabled">';
} }
if ($showempty || ! $atleastonepage) $out.='<option value="-1">&nbsp;</option>'; if ($showempty || ! $atleastonepage) $out.='<option value="-1">&nbsp;</option>';

8
htdocs/install/upgrade2.php
View File

@ -5030,7 +5030,7 @@ function migrate_users_socialnetworks()
dol_print_error($db); dol_print_error($db);
$db->rollback(); $db->rollback();
} }
print '<b>'.$langs->trans('MigrationUsersSocialNetworks')."</b><br>\n"; print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Users')."</b><br>\n";
print '</td></tr>'; print '</td></tr>';
} }
@ -5121,7 +5121,7 @@ function migrate_members_socialnetworks()
dol_print_error($db); dol_print_error($db);
$db->rollback(); $db->rollback();
} }
print '<b>'.$langs->trans('MigrationMembersSocialNetworks')."</b><br>\n"; print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Members')."</b><br>\n";
print '</td></tr>'; print '</td></tr>';
} }
@ -5216,7 +5216,7 @@ function migrate_contacts_socialnetworks()
dol_print_error($db); dol_print_error($db);
$db->rollback(); $db->rollback();
} }
print '<b>'.$langs->trans('MigrationContactsSocialNetworks')."</b><br>\n"; print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Contacts')."</b><br>\n";
print '</td></tr>'; print '</td></tr>';
} }
@ -5306,6 +5306,6 @@ function migrate_thirdparties_socialnetworks()
dol_print_error($db); dol_print_error($db);
$db->rollback(); $db->rollback();
} }
print '<b>'.$langs->trans('MigrationThirdpartiesSocialNetworks')."</b><br>\n"; print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Thirdparties')."</b><br>\n";
print '</td></tr>'; print '</td></tr>';
} }

5
htdocs/langs/en_US/install.lang
View File

@ -205,10 +205,7 @@ MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_exce
MigrationUserRightsEntity=Update entity field value of llx_user_rights MigrationUserRightsEntity=Update entity field value of llx_user_rights
MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
MigrationUserPhotoPath=Migration of photo paths for users MigrationUserPhotoPath=Migration of photo paths for users
MigrationUsersSocialNetworks=Migration of users fields social networks MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
MigrationMembersSocialNetworks=Migration of members fields social networks
MigrationContactsSocialNetworks=Migration of contacts fields social networks
MigrationThirdpartiesSocialNetworks=Migration of thirdparties fields social networks
MigrationReloadModule=Reload module %s MigrationReloadModule=Reload module %s
MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
ShowNotAvailableOptions=Show unavailable options ShowNotAvailableOptions=Show unavailable options

5
htdocs/website/index.php
View File

@ -3059,9 +3059,10 @@ if ($action == 'editmeta' || $action == 'createcontainer')
} }
elseif ($result > 0) elseif ($result > 0)
{ {
$translationof = $sourcepage->id; $translationof = 0;
//$translationof = $sourcepage->id;
print '<span class="opacitymedium">'.$langs->trans('ThisPageIsTranslationOf').'</span> '; print '<span class="opacitymedium">'.$langs->trans('ThisPageIsTranslationOf').'</span> ';
print $formwebsite->selectContainer($website, 'pageidfortranslation', $sourcepage->id, 1, $action); print $formwebsite->selectContainer($website, 'pageidfortranslation', $translationof, 1, $action, 'minwidth300');
} }
} }
print '</td></tr>'; print '</td></tr>';