archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes #429 upgrade message (#495)

Browse source 
fixes #429 link to Take a Tour with core string
This commit is contained in:
jeremydurand 2016-06-06 16:39:29 +02:00 committed by Pierrick Le Gall
parent 43ecfbf60a
commit 6c342689d9
3 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
language/en_UK/upgrade.lang.php
View file

@ -40,4 +40,5 @@ $lang['User permissions and group permissions have been erased'] = "Users and gr
$lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = "Only thumbnails prefix and webmaster mail address have been saved from previous configuration"; $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = "Only thumbnails prefix and webmaster mail address have been saved from previous configuration";
$lang['In <i>%s</i>, before <b>?></b>, insert:'] = 'In <i>%s</i>, before <b>?></b>, insert:'; $lang['In <i>%s</i>, before <b>?></b>, insert:'] = 'In <i>%s</i>, before <b>?></b>, insert:';
$lang['As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:'] = 'As a precaution, the following themes have been deactivated. You must check for upgradable themes before reactivating them:'; $lang['As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:'] = 'As a precaution, the following themes have been deactivated. You must check for upgradable themes before reactivating them:';
?> $lang['Discover what\'s new in Piwigo %s'] = 'Discover what\'s new in Piwigo %s';
?>

3
language/fr_FR/upgrade.lang.php
View file

@ -41,4 +41,5 @@ $lang['User permissions and group permissions have been erased'] = "Les permissi
$lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = "Seuls le préfixe des miniatures et l'adresse email du webmestre ont étés conservés de la précédente configuration"; $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = "Seuls le préfixe des miniatures et l'adresse email du webmestre ont étés conservés de la précédente configuration";
$lang['In <i>%s</i>, before <b>?></b>, insert:'] = 'Dans le fichier <i>%s</i>, avant <b>?></b>, insérez:'; $lang['In <i>%s</i>, before <b>?></b>, insert:'] = 'Dans le fichier <i>%s</i>, avant <b>?></b>, insérez:';
$lang['As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:'] = 'Par précaution, les thèmes suivants ont été désactivés. Vérifiez s\'il existe des mises à jour avant de les réactiver:'; $lang['As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:'] = 'Par précaution, les thèmes suivants ont été désactivés. Vérifiez s\'il existe des mises à jour avant de les réactiver:';
?> $lang['Discover what\'s new in Piwigo %s'] = 'Quoi de neuf dans cette version %s ?';
?>

12
upgrade.php
View file

@ -466,22 +466,12 @@ REPLACE INTO '.PLUGINS_TABLE.'
if (file_exists(PHPWG_PLUGINS_PATH .'TakeATour/tours/'.$version_.'/config.inc.php')) if (file_exists(PHPWG_PLUGINS_PATH .'TakeATour/tours/'.$version_.'/config.inc.php'))
{ {
load_language(
'plugin.lang',
PHPWG_PLUGINS_PATH.'TakeATour/',
array(
'language' => $language,
'force_fallback'=>'en_UK',
)
);
// we need the secret key for get_pwg_token() // we need the secret key for get_pwg_token()
load_conf_from_db(); load_conf_from_db();
$template->assign( $template->assign(
array( array(
// TODO find a better way to do that, with a core string in English 'button_label' => l10n('Discover what\'s new in Piwigo %s', get_branch_from_version(PHPWG_VERSION)),
'button_label' => str_replace('2.7', get_branch_from_version(PHPWG_VERSION), l10n('2_7_0_descrp')),
'button_link' => 'admin.php?submited_tour_path=tours/'.$version_.'&amp;pwg_token='.get_pwg_token(), 'button_link' => 'admin.php?submited_tour_path=tours/'.$version_.'&amp;pwg_token='.get_pwg_token(),
) )
); );