aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeremydurand <jeremydurand24@hotmail.fr>2016-06-06 16:39:29 +0200
committerPierrick Le Gall <plg@piwigo.org>2016-06-06 16:39:29 +0200
commit6c342689d9e226d1c09c8fa1fd99d8f8c4944497 (patch)
treea832122b48d6ec178a3183ae25ecc2495d3ae68c
parent43ecfbf60a8eba6886c3915774c68665fd4258b6 (diff)
fixes #429 upgrade message (#495)
fixes #429 link to Take a Tour with core string
-rw-r--r--language/en_UK/upgrade.lang.php1
-rw-r--r--language/fr_FR/upgrade.lang.php1
-rw-r--r--upgrade.php12
3 files changed, 3 insertions, 11 deletions
diff --git a/language/en_UK/upgrade.lang.php b/language/en_UK/upgrade.lang.php
index f279fe618..221336482 100644
--- a/language/en_UK/upgrade.lang.php
+++ b/language/en_UK/upgrade.lang.php
@@ -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['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['Discover what\'s new in Piwigo %s'] = 'Discover what\'s new in Piwigo %s';
?>
diff --git a/language/fr_FR/upgrade.lang.php b/language/fr_FR/upgrade.lang.php
index 6c2d6b556..f831a65dc 100644
--- a/language/fr_FR/upgrade.lang.php
+++ b/language/fr_FR/upgrade.lang.php
@@ -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['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['Discover what\'s new in Piwigo %s'] = 'Quoi de neuf dans cette version %s ?';
?>
diff --git a/upgrade.php b/upgrade.php
index 11b745b6d..6d7c12638 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -466,22 +466,12 @@ REPLACE INTO '.PLUGINS_TABLE.'
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()
load_conf_from_db();
$template->assign(
array(
- // TODO find a better way to do that, with a core string in English
- 'button_label' => str_replace('2.7', get_branch_from_version(PHPWG_VERSION), l10n('2_7_0_descrp')),
+ 'button_label' => l10n('Discover what\'s new in Piwigo %s', get_branch_from_version(PHPWG_VERSION)),
'button_link' => 'admin.php?submited_tour_path=tours/'.$version_.'&amp;pwg_token='.get_pwg_token(),
)
);