From eef93e99be0d44ec6dc4fa86373ba6fd2b8c5f48 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sat, 8 Sep 2012 13:22:44 +0200
Subject: [PATCH] Use hardcoded plugin loading error message as $lang isn't
 initialized

When loading plugins, $lang might not be initialized yet, so use a
hardcoded error message instead, especially as this error should only be
displayed for the admin (and then fixed). This also removes the
previously localized message, it might be re-added as part of the new
extension manager.
---
 inc/lang/ar/lang.php           | 1 -
 inc/lang/bg/lang.php           | 2 --
 inc/lang/cs/lang.php           | 1 -
 inc/lang/da/lang.php           | 1 -
 inc/lang/de-informal/lang.php  | 1 -
 inc/lang/de/lang.php           | 1 -
 inc/lang/el/lang.php           | 1 -
 inc/lang/en/lang.php           | 2 --
 inc/lang/eo/lang.php           | 1 -
 inc/lang/es/lang.php           | 1 -
 inc/lang/fa/lang.php           | 1 -
 inc/lang/fi/lang.php           | 1 -
 inc/lang/fr/lang.php           | 1 -
 inc/lang/gl/lang.php           | 1 -
 inc/lang/it/lang.php           | 1 -
 inc/lang/ja/lang.php           | 1 -
 inc/lang/ko/lang.php           | 1 -
 inc/lang/lv/lang.php           | 1 -
 inc/lang/nl/lang.php           | 1 -
 inc/lang/no/lang.php           | 1 -
 inc/lang/pl/lang.php           | 1 -
 inc/lang/pt/lang.php           | 1 -
 inc/lang/ro/lang.php           | 1 -
 inc/lang/ru/lang.php           | 1 -
 inc/lang/sk/lang.php           | 1 -
 inc/lang/sl/lang.php           | 1 -
 inc/lang/vi/lang.php           | 2 --
 inc/lang/zh-tw/lang.php        | 1 -
 inc/lang/zh/lang.php           | 1 -
 inc/plugincontroller.class.php | 3 +--
 30 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php
index 350e26695..8f34936f3 100644
--- a/inc/lang/ar/lang.php
+++ b/inc/lang/ar/lang.php
@@ -324,4 +324,3 @@ $lang['media_perm_read']       = 'عفوا، لست مخولا بقراءة ال
 $lang['media_perm_upload']     = 'عفوا، لست مخولا برفع الملفات.';
 $lang['media_update']          = 'ارفع إصدارا أحدث';
 $lang['media_restore']         = 'استرجع هذه النسخة';
-$lang['plugin_install_err']    = 'ثبتت الإضافة بشكل خاطئ. أعد تسمية دليل الإضافة \'%s\' إلى \'%s\'.';
diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php
index 562dc78b3..3c6c17211 100644
--- a/inc/lang/bg/lang.php
+++ b/inc/lang/bg/lang.php
@@ -344,6 +344,4 @@ $lang['media_perm_upload']     = 'За съжаление нямате дост
 $lang['media_update']          = 'Качване на нова версия';
 $lang['media_restore']         = 'Възстановяване на тази версия';
 
-$lang['plugin_install_err']    = 'Неправилно инсталирана приставка. Моля, преименувайте директорията \'%s\' на \'%s\'.';
-
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index 05627b6bc..a53da327a 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -322,4 +322,3 @@ $lang['media_perm_read']       = 'Bohužel, nemáte práva číst soubory.';
 $lang['media_perm_upload']     = 'Bohužel, nemáte práva nahrávat soubory.';
 $lang['media_update']          = 'Nahrát novou verzi';
 $lang['media_restore']         = 'Obnovit tuto verzi';
-$lang['plugin_install_err']    = 'Plugin je špatně nainstalován. Přejmenujte adresář pluginu \'%s\' na \'%s\'.';
diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index 97f2138b4..ee8de1bb8 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -325,4 +325,3 @@ $lang['media_perm_read']       = 'Du har ikke nok rettigheder til at læse filer
 $lang['media_perm_upload']     = 'Du har ikke nok rettigheder til at uploade filer.';
 $lang['media_update']          = 'Upload ny version';
 $lang['media_restore']         = 'Genskab denne version';
-$lang['plugin_install_err']    = 'Plugin installeret forkert.  Omdøb plugin folder \'%s\' til \'%s\'.';
diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php
index 37469522f..0558a2a56 100644
--- a/inc/lang/de-informal/lang.php
+++ b/inc/lang/de-informal/lang.php
@@ -327,4 +327,3 @@ $lang['media_perm_read']       = 'Du besitzt nicht die notwendigen Berechtigunge
 $lang['media_perm_upload']     = 'Du besitzt nicht die notwendigen Berechtigungen um Dateien hochzuladen.';
 $lang['media_update']          = 'Neue Version hochladen';
 $lang['media_restore']         = 'Diese Version wiederherstellen';
-$lang['plugin_install_err']    = 'Plugin nicht korrekt installiert. Plugin-Verzeichnis von \'%s\' nach \'%s\' umbenennen.';
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index 4ea75157b..410022a3d 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -329,4 +329,3 @@ $lang['media_perm_read']       = 'Sie besitzen nicht die notwendigen Berechtigun
 $lang['media_perm_upload']     = 'Sie besitzen nicht die notwendigen Berechtigungen um Dateien hochzuladen.';
 $lang['media_update']          = 'Neue Version hochladen';
 $lang['media_restore']         = 'Diese Version wiederherstellen';
-$lang['plugin_install_err']    = 'Plugin nicht korrekt installiert. Plugin-Verzeichnis von \'%s\' nach \'%s\' umbenennen.';
diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php
index 95f1a1ea5..443a5061d 100644
--- a/inc/lang/el/lang.php
+++ b/inc/lang/el/lang.php
@@ -306,4 +306,3 @@ $lang['media_perm_read']       = 'Συγνώμη, δεν έχετε επαρκή
 $lang['media_perm_upload']     = 'Συγνώμη, δεν έχετε επαρκή διακαιώματα για να φορτώσετε αυτά τα αρχεία.';
 $lang['media_update']          = 'Φόρτωση νέας έκδοσης';
 $lang['media_restore']         = 'Επαναφορά αυτή της έκδοσης';
-$lang['plugin_install_err']    = 'Η επέκταση δεν εγκαταστήθηκε σωστά. Μετονομασία φακέλου επεκτάσεων από \'%s\' σε \'%s\'.';
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 3c51ba224..0e5a9ac3c 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -347,6 +347,4 @@ $lang['media_perm_upload']     = 'Sorry, you don\'t have enough rights to upload
 $lang['media_update']          = 'Upload new version';
 $lang['media_restore']         = 'Restore this version';
 
-$lang['plugin_install_err']    = "Plugin installed incorrectly. Rename plugin directory '%s' to '%s'.";
-
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index b2c64b2a6..bfdb39011 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -318,4 +318,3 @@ $lang['media_perm_read']       = 'Bedaûrinde viaj rajtoj ne sufiĉas por legi d
 $lang['media_perm_upload']     = 'Bedaûrinde viaj rajtoj ne sufiĉas por alŝuti dosierojn.';
 $lang['media_update']          = 'Alŝuti novan version';
 $lang['media_restore']         = 'Restarigi ĉi tiun version';
-$lang['plugin_install_err']    = 'Kromaĵo instalita malĝuste. Renomu la kromaĵan dosierujon \'%s\' al \'%s\'.';
diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index 8bd0fd718..95b1af43e 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -338,4 +338,3 @@ $lang['media_perm_read']       = 'Disculpa, no tienes los permisos necesarios pa
 $lang['media_perm_upload']     = 'Disculpa, no tienes los permisos necesarios para cargar ficheros.';
 $lang['media_update']          = 'Actualizar nueva versión';
 $lang['media_restore']         = 'Restaurar esta versión';
-$lang['plugin_install_err']    = 'Plugin instalado incorrectamente. Renombra el directorio de plugins \'%s\' to \'%s\'.';
diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php
index 1b8586d5a..33a89a631 100644
--- a/inc/lang/fa/lang.php
+++ b/inc/lang/fa/lang.php
@@ -323,4 +323,3 @@ $lang['media_perm_read']       = 'متاسفانه ، شما حق خواندن 
 $lang['media_perm_upload']     = 'متاسفانه ، شما حق آپلود این فایل ها را ندارید.';
 $lang['media_update']          = 'آپلود نسخه جدید';
 $lang['media_restore']         = 'بازیابی این نسخه';
-$lang['plugin_install_err']    = 'افزونه به صورت نادرست نصب شده است. دایرکتوری افزونه را از \'%s\' به \'%s\' تغییر دهید.';
diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index 11f8b61e1..4f5f6f1a2 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -319,4 +319,3 @@ $lang['media_perm_read']       = 'Anteeksi. Sinulla ei ole riittävästi oikeuks
 $lang['media_perm_upload']     = 'Anteeksi. Sinulla ei ole riittävästi oikeuksia lähettääksesi tiedostoja.';
 $lang['media_update']          = 'Lähetä uusi versio';
 $lang['media_restore']         = 'Palauta tämä versio';
-$lang['plugin_install_err']    = 'Liitännäinen asentui virheellisesti. Nimeä liitännäisen hakemisto \'%s\' -> \'%s\'';
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index f61ee9296..c4080bc50 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -333,4 +333,3 @@ $lang['media_perm_read']       = 'Désolé, vous n\'avez pas les droits pour lir
 $lang['media_perm_upload']     = 'Désolé, vous n\'avez pas les droits pour télécharger des fichiers.';
 $lang['media_update']          = 'Télécharger une nouvelle version';
 $lang['media_restore']         = 'Restaurer cette version';
-$lang['plugin_install_err']    = 'Extension mal installée. Renommez le dossier de l\'extension \'%s\' en \'%s\'.';
diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php
index 9636d6c15..23bd9a741 100644
--- a/inc/lang/gl/lang.php
+++ b/inc/lang/gl/lang.php
@@ -310,4 +310,3 @@ $lang['media_perm_read']       = 'Sentímolo, non tes permisos suficientes para
 $lang['media_perm_upload']     = 'Sentímolo, non tes permisos suficientes para subir arquivos.';
 $lang['media_update']          = 'Subir nova versión';
 $lang['media_restore']         = 'Restaurar esta versión';
-$lang['plugin_install_err']    = 'Extensión instalada correctamente. Re-nomea o directorio da extensión de \'%s\' a \'%s\'.';
diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php
index 70082caae..866492219 100644
--- a/inc/lang/it/lang.php
+++ b/inc/lang/it/lang.php
@@ -314,4 +314,3 @@ $lang['media_perm_read']       = 'Spiacente, non hai abbastanza privilegi per le
 $lang['media_perm_upload']     = 'Spiacente, non hai abbastanza privilegi per caricare files.';
 $lang['media_update']          = 'Carica nuova versione';
 $lang['media_restore']         = 'Ripristina questa versione';
-$lang['plugin_install_err']    = 'Plugin installato non correttamente. Rinomino la cartella del plugin \'%s\' in \'%s\'.';
diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php
index 490c84cc9..791ef9a6e 100644
--- a/inc/lang/ja/lang.php
+++ b/inc/lang/ja/lang.php
@@ -318,4 +318,3 @@ $lang['media_perm_read']       = 'ファイルを閲覧する権限がありま
 $lang['media_perm_upload']     = 'ファイルをアップロードする権限がありません。';
 $lang['media_update']          = '新しいバージョンをアップロード';
 $lang['media_restore']         = 'このバージョンを復元';
-$lang['plugin_install_err']    = 'プラグインが正しくインストールされませんでした。プラグインのディレクトリ名を \'%s\' から \'%s\' に変更してください。';
diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index 5a729e982..64507fa81 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -320,4 +320,3 @@ $lang['media_perm_read']       = '이 파일을 읽을 권한이 없습니다.';
 $lang['media_perm_upload']     = '파일을 올릴 권한이 없습니다.';
 $lang['media_update']          = '새 버전 올리기';
 $lang['media_restore']         = '이 버전으로 되돌리기';
-$lang['plugin_install_err']    = '플러그인 설치가 잘못되었습니다. 플러그인 디렉토리 \'%s\'(을)를 \'%s\'(으)로 바꾸십시오.';
diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php
index b02e7f471..cc17b17fe 100644
--- a/inc/lang/lv/lang.php
+++ b/inc/lang/lv/lang.php
@@ -304,4 +304,3 @@ $lang['media_perm_read']       = 'Atvainojiet, jums nav tiesību skatīt failus.
 $lang['media_perm_upload']     = 'Atvainojiet, jums nav tiesību augšupielādēt. ';
 $lang['media_update']          = 'Augšupielādēt jaunu versiju';
 $lang['media_restore']         = 'Atjaunot Å¡o versiju';
-$lang['plugin_install_err']    = 'Modulis aplami instalēts.  Pārdēvē moduļa direktoriju %s par %s.';
diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index 8080c359c..fdc0c075a 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -328,4 +328,3 @@ $lang['media_perm_read']       = 'Sorry, u heeft niet voldoende rechten om besta
 $lang['media_perm_upload']     = 'Sorry, u heeft niet voldoende rechten om bestanden te uploaden.';
 $lang['media_update']          = 'Upload nieuwe versie';
 $lang['media_restore']         = 'Deze versie terugzetten';
-$lang['plugin_install_err']    = 'Plugin is juist geinstalleerd. Hernoem plugin map \'%s\' naar \'%s\'.';
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index 97ef741ef..cc3d34aed 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -323,4 +323,3 @@ $lang['media_perm_read']       = 'Beklager, du har ikke tilgang til å lese file
 $lang['media_perm_upload']     = 'Beklager, du har ikke tilgang til å laste opp filer.';
 $lang['media_update']          = 'Last opp ny versjon';
 $lang['media_restore']         = 'Gjenopprett denne versjonen';
-$lang['plugin_install_err']    = 'Tillegget ble feil installert. Skift navn på mappen \'%s\' til \'%s\'.';
diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php
index 79d18bbf5..2f448d291 100644
--- a/inc/lang/pl/lang.php
+++ b/inc/lang/pl/lang.php
@@ -325,4 +325,3 @@ $lang['media_perm_read']       = 'Przepraszamy, nie masz wystarczajÄ…cych uprawn
 $lang['media_perm_upload']     = 'Przepraszamy, nie masz wystarczających uprawnień do przesyłania plików.';
 $lang['media_update']          = 'Prześlij nową wersję';
 $lang['media_restore']         = 'Odtwórz tą wersję';
-$lang['plugin_install_err']    = 'Wtyczka zainstalowana nieprawidłowo. Zmień nazwę katalogu wtyczki \'%s\' na \'%s\'.';
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index a0b0f57e8..af388985c 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -317,4 +317,3 @@ $lang['js']['media_drop']       = 'Largue ficheiros aqui para enviar';
 $lang['js']['media_cancel']     = 'remover';
 $lang['js']['media_overwrt']    = 'Escrever por cima de ficheiros existentes';
 
-$lang['plugin_install_err'] = "Plugin instalado incorrectamente. Renomeie a pasta do plugin de '%s' para '%s'.";
diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php
index 41727e521..0c7e02605 100644
--- a/inc/lang/ro/lang.php
+++ b/inc/lang/ro/lang.php
@@ -320,4 +320,3 @@ $lang['media_perm_read']       = 'Ne pare rău, dar nu aveți suficiente dreptur
 $lang['media_perm_upload']     = 'Ne pare rău, dar nu aveți suficiente drepturi pentru a putea încărca fișiere.';
 $lang['media_update']          = 'Încarcă noua versiune';
 $lang['media_restore']         = 'Restaurează această versiune';
-$lang['plugin_install_err']    = 'Modul instalat greșit. Redenumește directorul modulului \'%s\' în \'%s\'.';
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index 4c3d26b1d..800b1a1b2 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -332,4 +332,3 @@ $lang['media_perm_read']       = 'Извините, у Вас недостато
 $lang['media_perm_upload']     = 'Извините, у Вас недостаточно прав для загрузки файлов.';
 $lang['media_update']          = 'Загрузить новую версию';
 $lang['media_restore']         = 'Восстановить эту версию';
-$lang['plugin_install_err']    = 'Плагин установлен некорректно. Переименуйте папку плагина из \'%s\' в \'%s\'.';
diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php
index 85e899b06..25b2f2a2b 100644
--- a/inc/lang/sk/lang.php
+++ b/inc/lang/sk/lang.php
@@ -308,4 +308,3 @@ $lang['media_perm_read']       = 'Prepáčte, ale nemáte dostatočné oprávnen
 $lang['media_perm_upload']     = 'Prepáčte, ale nemáte dostatočné oprávnenie na nahrávanie súborov.';
 $lang['media_update']          = 'Nahrať novú verziu';
 $lang['media_restore']         = 'Obnoviť túto verziu';
-$lang['plugin_install_err']    = 'Plugin nebol nainštalovaný úspešne. Premenujte adresár s pluginom \'%s\' na \'%s\'.';
diff --git a/inc/lang/sl/lang.php b/inc/lang/sl/lang.php
index b34ab67e4..3a4dbd22e 100644
--- a/inc/lang/sl/lang.php
+++ b/inc/lang/sl/lang.php
@@ -311,4 +311,3 @@ $lang['media_perm_read']       = 'Ni ustreznih dovoljenj za branje datotek.';
 $lang['media_perm_upload']     = 'Ni ustreznih dovoljenj za nalaganje datotek.';
 $lang['media_update']          = 'Naloži novo različico';
 $lang['media_restore']         = 'Obnovi to različico';
-$lang['plugin_install_err']    = 'Vstavek ni pravilno nameščen. Preimenujte mapo vstavka\'%s\' v \'%s\'.';
diff --git a/inc/lang/vi/lang.php b/inc/lang/vi/lang.php
index c9179f6b3..99c4d47e4 100644
--- a/inc/lang/vi/lang.php
+++ b/inc/lang/vi/lang.php
@@ -263,6 +263,4 @@ $lang['media_perm_upload']     = 'Xin lỗi, bạn không đủ quyền để up
 $lang['media_update']          = 'Tải lên phiên bản mới';
 $lang['media_restore']         = 'Phục hồi phiên bản này';
 
-$lang['plugin_install_err']    = "Plugin không được cài đặt chính xác.Đổi tên thư mục plugin '%s' thành '%s'.";
-
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php
index dd36dfdc4..2cceb4012 100644
--- a/inc/lang/zh-tw/lang.php
+++ b/inc/lang/zh-tw/lang.php
@@ -323,4 +323,3 @@ $lang['media_perm_read']       = '抱歉，您沒有足夠權限讀取檔案。'
 $lang['media_perm_upload']     = '抱歉，您沒有足夠權限上傳檔案。';
 $lang['media_update']          = '上傳新的版本';
 $lang['media_restore']         = '還原這個版本';
-$lang['plugin_install_err']    = '插件安裝錯誤。將插件目錄 "%s" 重新命名為 "%s" 。';
diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index 9ea0f5e7f..fc7b0cab3 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -329,4 +329,3 @@ $lang['media_perm_read']       = '抱歉，您没有足够权限读取这些文
 $lang['media_perm_upload']     = '抱歉，您没有足够权限来上传文件。';
 $lang['media_update']          = '上传新版本';
 $lang['media_restore']         = '恢复这个版本';
-$lang['plugin_install_err']    = '插件安装不正确。重命名插件目录“%s”为“%s”。';
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index 11636fb91..21f73f4cb 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -70,7 +70,6 @@ class Doku_Plugin_Controller {
 
         //we keep all loaded plugins available in global scope for reuse
         global $DOKU_PLUGINS;
-        global $lang;
 
         list($plugin,$component) = $this->_splitName($name);
 
@@ -97,7 +96,7 @@ class Doku_Plugin_Controller {
             $dir = $this->get_directory($plugin);
             $inf = confToHash(DOKU_PLUGIN."$dir/plugin.info.txt");
             if($inf['base'] && $inf['base'] != $plugin){
-                msg(sprintf($lang['plugin_install_err'],hsc($plugin),hsc($inf['base'])),-1);
+                msg(sprintf("Plugin installed incorrectly. Rename plugin directory '%s' to '%s'.", hsc($plugin), hsc($inf['base'])), -1);
             }
             return null;
         }
-- 
GitLab