Просмотр исходного кода

Fix i18n for installation script

See https://github.com/FreshRSS/FreshRSS/issues/334
Marien Fressinaud 11 лет назад
Родитель
Сommit
ddc50090b5
1 измененных файлов с 4 добавлено и 23 удалено
  1. 4 23
      app/install.php

+ 4 - 23
app/install.php

@@ -42,18 +42,12 @@ function param($key, $default = false) {
 
 
 // gestion internationalisation
-$translates = array();
-$actual = 'en';
 function initTranslate() {
-	global $translates;
-	global $actual;
-
-	$actual = isset($_SESSION['language']) ? $_SESSION['language'] : getBetterLanguage('en');
-
-	$file = APP_PATH . '/i18n/' . $actual . '.php';
-	if (file_exists($file)) {
-		$translates = array_merge($translates, include($file));
+	if (!isset($_SESSION['language'])) {
+		$_SESSION['language'] = getBetterLanguage('en');
 	}
+
+	Minz_Translate::init();
 }
 
 function getBetterLanguage($fallback) {
@@ -75,19 +69,6 @@ function availableLanguages() {
 	);
 }
 
-function _t($key) {
-	global $translates;
-	$translate = $key;
-	if (isset($translates[$key])) {
-		$translate = $translates[$key];
-	}
-
-	$args = func_get_args();
-	unset($args[0]);
-
-	return vsprintf($translate, $args);
-}
-
 
 /*** SAUVEGARDES ***/
 function saveLanguage() {