diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2014-03-16 21:23:50 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2014-03-16 21:23:50 +0100 |
| commit | e9ac0877f6c7eb3536f8f2b6b2a431c00de8fe4f (patch) | |
| tree | f712964318d38d2935f2afe909326c6b1d1e4caa | |
| parent | f10dcc4dcaefb086f27df5535c619073e0665b2e (diff) | |
| parent | 5c19269483d61ba921eaf572252d976c15152924 (diff) | |
| download | rpg-e9ac0877f6c7eb3536f8f2b6b2a431c00de8fe4f.tar.gz rpg-e9ac0877f6c7eb3536f8f2b6b2a431c00de8fe4f.tar.bz2 | |
Merge pull request #573 from splitbrain/FS#2437detailphprefactor
refactor detail.php to template.php
63 files changed, 198 insertions, 147 deletions
diff --git a/conf/mediameta.php b/conf/mediameta.php index 0428a4b88..f75fa0821 100644 --- a/conf/mediameta.php +++ b/conf/mediameta.php @@ -5,7 +5,7 @@ * following contents: * fieldname - Where data will be saved (EXIF or IPTC field) * label - key to lookup in the $lang var, if not found printed as is - * htmltype - 'text' or 'textarea' + * htmltype - 'text', 'textarea' or 'date' * lookups - array additional fields to lookup the data (EXIF or IPTC fields) * * The fields are not ordered continously to make inserting additional items diff --git a/inc/lang/af/lang.php b/inc/lang/af/lang.php index 826fda6e8..008110450 100644 --- a/inc/lang/af/lang.php +++ b/inc/lang/af/lang.php @@ -63,7 +63,7 @@ $lang['qb_extlink'] = 'Eksterne skakel'; $lang['qb_hr'] = 'Horisontale streep'; $lang['qb_sig'] = 'Handtekening met datum'; $lang['admin_register'] = 'Skep gerus \'n rekening'; -$lang['img_backto'] = 'Terug na'; +$lang['btn_img_backto'] = 'Terug na %s'; $lang['img_date'] = 'Datem'; $lang['img_camera'] = 'Camera'; $lang['i_wikiname'] = 'Wiki Naam'; diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php index 157513429..b0a2edc88 100644 --- a/inc/lang/ar/lang.php +++ b/inc/lang/ar/lang.php @@ -239,7 +239,7 @@ $lang['admin_register'] = 'أضف مستخدما جديدا'; $lang['metaedit'] = 'تحرير البيانات الشمولية '; $lang['metasaveerr'] = 'فشلت كتابة البيانات الشمولية'; $lang['metasaveok'] = 'حُفظت البيانات الشمولية'; -$lang['img_backto'] = 'عودة إلى'; +$lang['btn_img_backto'] = 'عودة إلى %s'; $lang['img_title'] = 'العنوان'; $lang['img_caption'] = 'وصف'; $lang['img_date'] = 'التاريخ'; @@ -252,7 +252,7 @@ $lang['img_camera'] = 'الكمرا'; $lang['img_keywords'] = 'كلمات مفتاحية'; $lang['img_width'] = 'العرض'; $lang['img_height'] = 'الإرتفاع'; -$lang['img_manager'] = 'اعرض في مدير الوسائط'; +$lang['btn_mediaManager'] = 'اعرض في مدير الوسائط'; $lang['subscr_subscribe_success'] = 'اضيف %s لقائمة اشتراك %s'; $lang['subscr_subscribe_error'] = 'خطأ في إضافة %s لقائمة اشتراك %s'; $lang['subscr_subscribe_noaddress'] = 'ليس هناك عنوان مرتبط بولوجك، لا يمكن اضافتك لقائمة الاشتراك'; diff --git a/inc/lang/az/lang.php b/inc/lang/az/lang.php index df54b4f10..8d51d2372 100644 --- a/inc/lang/az/lang.php +++ b/inc/lang/az/lang.php @@ -172,7 +172,7 @@ $lang['admin_register'] = 'İstifadəçi əlavə et'; $lang['metaedit'] = 'Meta-məlumatlarda düzəliş et'; $lang['metasaveerr'] = 'Meta-məlumatları yazan zamanı xəta'; $lang['metasaveok'] = 'Meta-məlumatlar yadda saxlandı'; -$lang['img_backto'] = 'Qayıd'; +$lang['btn_img_backto'] = 'Qayıd %s'; $lang['img_title'] = 'Başlıq'; $lang['img_caption'] = 'İmza'; $lang['img_date'] = 'Tarix'; diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php index bb74ff1ca..dcf66955f 100644 --- a/inc/lang/bg/lang.php +++ b/inc/lang/bg/lang.php @@ -236,7 +236,7 @@ $lang['admin_register'] = 'Добавяне на нов потребит $lang['metaedit'] = 'Редактиране на метаданни'; $lang['metasaveerr'] = 'Записването на метаданните се провали'; $lang['metasaveok'] = 'Метаданните са запазени успешно'; -$lang['img_backto'] = 'Назад към'; +$lang['btn_img_backto'] = 'Назад към %s'; $lang['img_title'] = 'Заглавие'; $lang['img_caption'] = 'Надпис'; $lang['img_date'] = 'Дата'; @@ -249,7 +249,7 @@ $lang['img_camera'] = 'Фотоапарат'; $lang['img_keywords'] = 'Ключови думи'; $lang['img_width'] = 'Ширина'; $lang['img_height'] = 'Височина'; -$lang['img_manager'] = 'Преглед в диспечера на файлове'; +$lang['btn_mediaManager'] = 'Преглед в диспечера на файлове'; $lang['subscr_subscribe_success'] = '%s е добавен към списъка с абониралите се за %s'; $lang['subscr_subscribe_error'] = 'Грешка при добавянето на %s към списъка с абониралите се за %s'; $lang['subscr_subscribe_noaddress'] = 'Добавянето ви към списъка с абонати не е възможно поради липсата на свързан адрес (на ел. поща) с профила ви.'; diff --git a/inc/lang/ca-valencia/lang.php b/inc/lang/ca-valencia/lang.php index 9ab423783..6e6f2a662 100644 --- a/inc/lang/ca-valencia/lang.php +++ b/inc/lang/ca-valencia/lang.php @@ -174,7 +174,7 @@ $lang['admin_register'] = 'Afegir nou usuari'; $lang['metaedit'] = 'Editar meta-senyes'; $lang['metasaveerr'] = 'Erro escrivint meta-senyes'; $lang['metasaveok'] = 'Meta-senyes guardades'; -$lang['img_backto'] = 'Tornar a'; +$lang['btn_img_backto'] = 'Tornar a %s'; $lang['img_title'] = 'Títul'; $lang['img_caption'] = 'Subtítul'; $lang['img_date'] = 'Data'; diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php index fd19c6834..1d297a1b1 100644 --- a/inc/lang/ca/lang.php +++ b/inc/lang/ca/lang.php @@ -228,7 +228,7 @@ $lang['admin_register'] = 'Afegeix nou usuari'; $lang['metaedit'] = 'Edita metadades'; $lang['metasaveerr'] = 'No s\'han pogut escriure les metadades'; $lang['metasaveok'] = 'S\'han desat les metadades'; -$lang['img_backto'] = 'Torna a'; +$lang['btn_img_backto'] = 'Torna a %s'; $lang['img_title'] = 'Títol'; $lang['img_caption'] = 'Peu d\'imatge'; $lang['img_date'] = 'Data'; diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php index a0f69b3dc..a491c1533 100644 --- a/inc/lang/cs/lang.php +++ b/inc/lang/cs/lang.php @@ -248,7 +248,7 @@ $lang['admin_register'] = 'Přidat nového uživatele'; $lang['metaedit'] = 'Upravit Metadata'; $lang['metasaveerr'] = 'Chyba při zápisu metadat'; $lang['metasaveok'] = 'Metadata uložena'; -$lang['img_backto'] = 'Zpět na'; +$lang['btn_img_backto'] = 'Zpět na %s'; $lang['img_title'] = 'Titulek'; $lang['img_caption'] = 'Popis'; $lang['img_date'] = 'Datum'; @@ -261,7 +261,7 @@ $lang['img_camera'] = 'Typ fotoaparátu'; $lang['img_keywords'] = 'Klíčová slova'; $lang['img_width'] = 'Šířka'; $lang['img_height'] = 'Výška'; -$lang['img_manager'] = 'Zobrazit ve správě médií'; +$lang['btn_mediaManager'] = 'Zobrazit ve správě médií'; $lang['subscr_subscribe_success'] = '%s byl přihlášen do seznamu odběratelů %s'; $lang['subscr_subscribe_error'] = 'Došlo k chybě při přihlašování %s do seznamu odběratelů %s'; $lang['subscr_subscribe_noaddress'] = 'K Vašemu loginu neexistuje žádná adresa, nemohl jste být přihlášen do seznamu odběratelů.'; diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php index eb50bb240..bdf882ba7 100644 --- a/inc/lang/da/lang.php +++ b/inc/lang/da/lang.php @@ -246,7 +246,7 @@ $lang['admin_register'] = 'Tilføj ny bruger'; $lang['metaedit'] = 'Rediger metadata'; $lang['metasaveerr'] = 'Skrivning af metadata fejlede'; $lang['metasaveok'] = 'Metadata gemt'; -$lang['img_backto'] = 'Tilbage til'; +$lang['btn_img_backto'] = 'Tilbage til %s'; $lang['img_title'] = 'Titel'; $lang['img_caption'] = 'Billedtekst'; $lang['img_date'] = 'Dato'; @@ -259,7 +259,7 @@ $lang['img_camera'] = 'Kamera'; $lang['img_keywords'] = 'Emneord'; $lang['img_width'] = 'Bredde'; $lang['img_height'] = 'Højde'; -$lang['img_manager'] = 'Vis i Media Manager'; +$lang['btn_mediaManager'] = 'Vis i Media Manager'; $lang['subscr_subscribe_success'] = 'Tilføjede %s til abonnement listen for %s'; $lang['subscr_subscribe_error'] = 'Fejl ved tilføjelse af %s til abonnement listen for %s'; $lang['subscr_subscribe_noaddress'] = 'Der er ikke nogen addresse forbundet til din bruger, så du kan ikke blive tilføjet til abonnement listen'; diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php index be3f14a18..2e2e04149 100644 --- a/inc/lang/de-informal/lang.php +++ b/inc/lang/de-informal/lang.php @@ -251,7 +251,7 @@ $lang['admin_register'] = 'Neuen Benutzer anmelden'; $lang['metaedit'] = 'Metadaten bearbeiten'; $lang['metasaveerr'] = 'Die Metadaten konnten nicht gesichert werden'; $lang['metasaveok'] = 'Metadaten gesichert'; -$lang['img_backto'] = 'Zurück zu'; +$lang['btn_img_backto'] = 'Zurück zu %s'; $lang['img_title'] = 'Titel'; $lang['img_caption'] = 'Bildunterschrift'; $lang['img_date'] = 'Datum'; @@ -264,7 +264,7 @@ $lang['img_camera'] = 'Kamera'; $lang['img_keywords'] = 'Schlagwörter'; $lang['img_width'] = 'Breite'; $lang['img_height'] = 'Höhe'; -$lang['img_manager'] = 'Im Medien-Manager anzeigen'; +$lang['btn_mediaManager'] = 'Im Medien-Manager anzeigen'; $lang['subscr_subscribe_success'] = 'Die Seite %s wurde zur Abonnementliste von %s hinzugefügt'; $lang['subscr_subscribe_error'] = 'Fehler beim Hinzufügen von %s zur Abonnementliste von %s'; $lang['subscr_subscribe_noaddress'] = 'In deinem Account ist keine E-Mail-Adresse hinterlegt. Dadurch kann die Seite nicht abonniert werden'; diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php index 1840f2a6c..6d9be75da 100644 --- a/inc/lang/de/lang.php +++ b/inc/lang/de/lang.php @@ -253,7 +253,7 @@ $lang['admin_register'] = 'Neuen Benutzer anmelden'; $lang['metaedit'] = 'Metadaten bearbeiten'; $lang['metasaveerr'] = 'Die Metadaten konnten nicht gesichert werden'; $lang['metasaveok'] = 'Metadaten gesichert'; -$lang['img_backto'] = 'Zurück zu'; +$lang['btn_img_backto'] = 'Zurück zu %s'; $lang['img_title'] = 'Titel'; $lang['img_caption'] = 'Bildunterschrift'; $lang['img_date'] = 'Datum'; @@ -266,7 +266,7 @@ $lang['img_camera'] = 'Kamera'; $lang['img_keywords'] = 'Schlagwörter'; $lang['img_width'] = 'Breite'; $lang['img_height'] = 'Höhe'; -$lang['img_manager'] = 'Im Medien-Manager anzeigen'; +$lang['btn_mediaManager'] = 'Im Medien-Manager anzeigen'; $lang['subscr_subscribe_success'] = '%s hat nun Änderungen der Seite %s abonniert'; $lang['subscr_subscribe_error'] = '%s kann die Änderungen der Seite %s nicht abonnieren'; $lang['subscr_subscribe_noaddress'] = 'Weil Ihre E-Mail-Adresse fehlt, können Sie das Thema nicht abonnieren'; diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php index 170e101a5..d97721cdb 100644 --- a/inc/lang/el/lang.php +++ b/inc/lang/el/lang.php @@ -241,7 +241,7 @@ $lang['admin_register'] = 'Προσθήκη νέου χρήστη'; $lang['metaedit'] = 'Τροποποίηση metadata'; $lang['metasaveerr'] = 'Η αποθήκευση των metadata απέτυχε'; $lang['metasaveok'] = 'Επιτυχής αποθήκευση metadata'; -$lang['img_backto'] = 'Επιστροφή σε'; +$lang['btn_img_backto'] = 'Επιστροφή σε %s'; $lang['img_title'] = 'Τίτλος'; $lang['img_caption'] = 'Λεζάντα'; $lang['img_date'] = 'Ημερομηνία'; @@ -254,7 +254,7 @@ $lang['img_camera'] = 'Camera'; $lang['img_keywords'] = 'Λέξεις-κλειδιά'; $lang['img_width'] = 'Πλάτος'; $lang['img_height'] = 'Ύψος'; -$lang['img_manager'] = 'Εμφάνιση στον διαχειριστή πολυμέσων'; +$lang['btn_mediaManager'] = 'Εμφάνιση στον διαχειριστή πολυμέσων'; $lang['subscr_subscribe_success'] = 'Ο/η %s προστέθηκε στην λίστα ειδοποιήσεων για το %s'; $lang['subscr_subscribe_error'] = 'Σφάλμα κατά την προσθήκη του/της %s στην λίστα ειδοποιήσεων για το %s'; $lang['subscr_subscribe_noaddress'] = 'Δεν υπάρχει διεύθυνση ταχυδρομείου συσχετισμένη με το όνομα χρήστη σας. Κατά συνέπεια δεν μπορείτε να προστεθείτε στην λίστα ειδοποιήσεων'; diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 981960495..e53a25815 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -52,6 +52,8 @@ $lang['btn_register'] = 'Register'; $lang['btn_apply'] = 'Apply'; $lang['btn_media'] = 'Media Manager'; $lang['btn_deleteuser'] = 'Remove My Account'; +$lang['btn_img_backto'] = 'Back to %s'; +$lang['btn_mediaManager'] = 'View in media manager'; $lang['loggedinas'] = 'Logged in as'; $lang['user'] = 'Username'; @@ -259,7 +261,6 @@ $lang['admin_register'] = 'Add new user'; $lang['metaedit'] = 'Edit Metadata'; $lang['metasaveerr'] = 'Writing metadata failed'; $lang['metasaveok'] = 'Metadata saved'; -$lang['img_backto'] = 'Back to'; $lang['img_title'] = 'Title'; $lang['img_caption'] = 'Caption'; $lang['img_date'] = 'Date'; @@ -272,7 +273,6 @@ $lang['img_camera'] = 'Camera'; $lang['img_keywords'] = 'Keywords'; $lang['img_width'] = 'Width'; $lang['img_height'] = 'Height'; -$lang['img_manager'] = 'View in media manager'; $lang['subscr_subscribe_success'] = 'Added %s to subscription list for %s'; $lang['subscr_subscribe_error'] = 'Error adding %s to subscription list for %s'; diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php index 97231bdce..b3c19b601 100644 --- a/inc/lang/eo/lang.php +++ b/inc/lang/eo/lang.php @@ -240,7 +240,7 @@ $lang['admin_register'] = 'Aldoni novan uzanton'; $lang['metaedit'] = 'Redakti metadatumaron'; $lang['metasaveerr'] = 'La konservo de metadatumaro malsukcesis'; $lang['metasaveok'] = 'La metadatumaro konserviĝis'; -$lang['img_backto'] = 'Iri reen al'; +$lang['btn_img_backto'] = 'Iri reen al %s'; $lang['img_title'] = 'Titolo'; $lang['img_caption'] = 'Priskribo'; $lang['img_date'] = 'Dato'; @@ -253,7 +253,7 @@ $lang['img_camera'] = 'Kamerao'; $lang['img_keywords'] = 'Ŝlosilvortoj'; $lang['img_width'] = 'Larĝeco'; $lang['img_height'] = 'Alteco'; -$lang['img_manager'] = 'Rigardi en aŭdvidaĵ-administrilo'; +$lang['btn_mediaManager'] = 'Rigardi en aŭdvidaĵ-administrilo'; $lang['subscr_subscribe_success'] = 'Aldonis %s al la abonlisto por %s'; $lang['subscr_subscribe_error'] = 'Eraro dum aldono de %s al la abonlisto por %s'; $lang['subscr_subscribe_noaddress'] = 'Ne estas adreso ligita al via ensaluto, ne eblas aldoni vin al la abonlisto'; diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php index b9f81dd82..336e60089 100644 --- a/inc/lang/es/lang.php +++ b/inc/lang/es/lang.php @@ -263,7 +263,7 @@ $lang['admin_register'] = 'Añadir nuevo usuario'; $lang['metaedit'] = 'Editar metadatos'; $lang['metasaveerr'] = 'La escritura de los metadatos ha fallado'; $lang['metasaveok'] = 'Los metadatos han sido guardados'; -$lang['img_backto'] = 'Volver a'; +$lang['btn_img_backto'] = 'Volver a %s'; $lang['img_title'] = 'Título'; $lang['img_caption'] = 'Epígrafe'; $lang['img_date'] = 'Fecha'; @@ -276,7 +276,7 @@ $lang['img_camera'] = 'Cámara'; $lang['img_keywords'] = 'Palabras claves'; $lang['img_width'] = 'Ancho'; $lang['img_height'] = 'Alto'; -$lang['img_manager'] = 'Ver en el Administrador de medios'; +$lang['btn_mediaManager'] = 'Ver en el Administrador de medios'; $lang['subscr_subscribe_success'] = 'Se agregó %s a las listas de suscripción para %s'; $lang['subscr_subscribe_error'] = 'Error al agregar %s a las listas de suscripción para %s'; $lang['subscr_subscribe_noaddress'] = 'No hay dirección asociada con tu registro, no se puede agregarte a la lista de suscripción'; diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php index ee9b1d969..49fc33e17 100644 --- a/inc/lang/et/lang.php +++ b/inc/lang/et/lang.php @@ -242,7 +242,7 @@ $lang['admin_register'] = 'Lisa kasutaja'; $lang['metaedit'] = 'Muuda lisainfot'; $lang['metasaveerr'] = 'Lisainfo salvestamine läks untsu.'; $lang['metasaveok'] = 'Lisainfo salvestatud'; -$lang['img_backto'] = 'Tagasi'; +$lang['btn_img_backto'] = 'Tagasi %s'; $lang['img_title'] = 'Tiitel'; $lang['img_caption'] = 'Kirjeldus'; $lang['img_date'] = 'Kuupäev'; diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php index c7e7ead9a..9a38099b3 100644 --- a/inc/lang/eu/lang.php +++ b/inc/lang/eu/lang.php @@ -227,7 +227,7 @@ $lang['admin_register'] = 'Erabiltzaile berria gehitu'; $lang['metaedit'] = 'Metadatua Aldatu'; $lang['metasaveerr'] = 'Metadatuaren idazketak huts egin du'; $lang['metasaveok'] = 'Metadatua gordea'; -$lang['img_backto'] = 'Atzera hona'; +$lang['btn_img_backto'] = 'Atzera hona %s'; $lang['img_title'] = 'Izenburua'; $lang['img_caption'] = 'Epigrafea'; $lang['img_date'] = 'Data'; @@ -240,7 +240,7 @@ $lang['img_camera'] = 'Kamera'; $lang['img_keywords'] = 'Hitz-gakoak'; $lang['img_width'] = 'Zabalera'; $lang['img_height'] = 'Altuera'; -$lang['img_manager'] = 'Media kudeatzailean ikusi'; +$lang['btn_mediaManager'] = 'Media kudeatzailean ikusi'; $lang['subscr_subscribe_success'] = '%s gehitua %s-ren harpidetza zerrendara'; $lang['subscr_subscribe_error'] = 'Errorea %s gehitzen %s-ren harpidetza zerrendara'; $lang['subscr_subscribe_noaddress'] = 'Ez dago helbiderik zure login-arekin lotuta, ezin zara harpidetza zerrendara gehitua izan.'; diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php index dbad62890..1e819419f 100644 --- a/inc/lang/fa/lang.php +++ b/inc/lang/fa/lang.php @@ -240,7 +240,7 @@ $lang['admin_register'] = 'یک حساب جدید بسازید'; $lang['metaedit'] = 'ویرایش دادههای متا'; $lang['metasaveerr'] = 'نوشتن دادهنما با مشکل مواجه شد'; $lang['metasaveok'] = 'دادهنما ذخیره شد'; -$lang['img_backto'] = 'بازگشت به '; +$lang['btn_img_backto'] = 'بازگشت به %s'; $lang['img_title'] = 'عنوان تصویر'; $lang['img_caption'] = 'عنوان'; $lang['img_date'] = 'تاریخ'; @@ -253,7 +253,7 @@ $lang['img_camera'] = 'دوربین'; $lang['img_keywords'] = 'واژههای کلیدی'; $lang['img_width'] = 'عرض'; $lang['img_height'] = 'ارتفاع'; -$lang['img_manager'] = 'دیدن در مدیریت محتوای چند رسانه ای'; +$lang['btn_mediaManager'] = 'دیدن در مدیریت محتوای چند رسانه ای'; $lang['subscr_subscribe_success'] = '%s به لیست آبونه %s افزوده شد'; $lang['subscr_subscribe_error'] = 'اشکال در افزودن %s به لیست آبونه %s'; $lang['subscr_subscribe_noaddress'] = 'هیچ آدرسی برای این عضویت اضافه نشده است، شما نمیتوانید به لیست آبونه اضافه شوید'; diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php index feefc3da8..9b877013e 100644 --- a/inc/lang/fi/lang.php +++ b/inc/lang/fi/lang.php @@ -240,7 +240,7 @@ $lang['admin_register'] = 'Lisää uusi käyttäjä'; $lang['metaedit'] = 'Muokkaa metadataa'; $lang['metasaveerr'] = 'Metadatan kirjoittaminen epäonnistui'; $lang['metasaveok'] = 'Metadata tallennettu'; -$lang['img_backto'] = 'Takaisin'; +$lang['btn_img_backto'] = 'Takaisin %s'; $lang['img_title'] = 'Otsikko'; $lang['img_caption'] = 'Kuvateksti'; $lang['img_date'] = 'Päivämäärä'; @@ -253,7 +253,7 @@ $lang['img_camera'] = 'Kamera'; $lang['img_keywords'] = 'Avainsanat'; $lang['img_width'] = 'Leveys'; $lang['img_height'] = 'Korkeus'; -$lang['img_manager'] = 'Näytä mediamanagerissa'; +$lang['btn_mediaManager'] = 'Näytä mediamanagerissa'; $lang['subscr_subscribe_success'] = '%s lisätty %s tilauslistalle'; $lang['subscr_subscribe_error'] = 'Virhe lisättäessä %s tilauslistalle %s'; $lang['subscr_subscribe_noaddress'] = 'Login tiedoissasi ei ole sähköpostiosoitetta. Sinua ei voi lisätä tilaukseen'; diff --git a/inc/lang/fo/lang.php b/inc/lang/fo/lang.php index 161e7321a..2613186eb 100644 --- a/inc/lang/fo/lang.php +++ b/inc/lang/fo/lang.php @@ -157,7 +157,7 @@ $lang['admin_register'] = 'Upprætta nýggjan brúkara'; $lang['metaedit'] = 'Rætta metadáta'; $lang['metasaveerr'] = 'Brek við skriving av metadáta'; $lang['metasaveok'] = 'Metadáta goymt'; -$lang['img_backto'] = 'Aftur til'; +$lang['btn_img_backto'] = 'Aftur til %s'; $lang['img_title'] = 'Heitið'; $lang['img_caption'] = 'Myndatekstur'; $lang['img_date'] = 'Dato'; diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php index 32e3055f7..40bc25d10 100644 --- a/inc/lang/fr/lang.php +++ b/inc/lang/fr/lang.php @@ -259,7 +259,7 @@ $lang['admin_register'] = 'Ajouter un nouvel utilisateur'; $lang['metaedit'] = 'Modifier les métadonnées'; $lang['metasaveerr'] = 'Erreur lors de l\'enregistrement des métadonnées'; $lang['metasaveok'] = 'Métadonnées enregistrées'; -$lang['img_backto'] = 'Retour à'; +$lang['btn_img_backto'] = 'Retour à %s'; $lang['img_title'] = 'Titre'; $lang['img_caption'] = 'Légende'; $lang['img_date'] = 'Date'; @@ -272,7 +272,7 @@ $lang['img_camera'] = 'Appareil photo'; $lang['img_keywords'] = 'Mots-clés'; $lang['img_width'] = 'Largeur'; $lang['img_height'] = 'Hauteur'; -$lang['img_manager'] = 'Voir dans le gestionnaire de médias'; +$lang['btn_mediaManager'] = 'Voir dans le gestionnaire de médias'; $lang['subscr_subscribe_success'] = '%s a été ajouté à la liste de souscription de %s'; $lang['subscr_subscribe_error'] = 'Erreur à l\'ajout de %s à la liste de souscription de %s'; $lang['subscr_subscribe_noaddress'] = 'Il n\'y a pas d\'adresse associée à votre identifiant, vous ne pouvez pas être ajouté à la liste de souscription'; diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php index 65967a3b5..0c81f1fb2 100644 --- a/inc/lang/gl/lang.php +++ b/inc/lang/gl/lang.php @@ -230,7 +230,7 @@ $lang['admin_register'] = 'Engadir novo usuario'; $lang['metaedit'] = 'Editar Metadatos'; $lang['metasaveerr'] = 'Non se puideron escribir os metadatos'; $lang['metasaveok'] = 'Metadatos gardados'; -$lang['img_backto'] = 'Volver a'; +$lang['btn_img_backto'] = 'Volver a %s'; $lang['img_title'] = 'Título'; $lang['img_caption'] = 'Lenda'; $lang['img_date'] = 'Data'; @@ -243,7 +243,7 @@ $lang['img_camera'] = 'Cámara'; $lang['img_keywords'] = 'Verbas chave'; $lang['img_width'] = 'Ancho'; $lang['img_height'] = 'Alto'; -$lang['img_manager'] = 'Ver no xestor de arquivos-media'; +$lang['btn_mediaManager'] = 'Ver no xestor de arquivos-media'; $lang['subscr_subscribe_success'] = 'Engadido %s á lista de subscrición para %s'; $lang['subscr_subscribe_error'] = 'Erro ao tentar engadir %s á lista de subscrición para %s'; $lang['subscr_subscribe_noaddress'] = 'Non hai enderezos asociados co teu inicio de sesión, non é posíbel engadirte á lista de subscrición'; diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php index 8efe0da17..5339d1802 100644 --- a/inc/lang/he/lang.php +++ b/inc/lang/he/lang.php @@ -243,7 +243,7 @@ $lang['admin_register'] = 'הוספת משתמש חדש'; $lang['metaedit'] = 'עריכת נתוני העל'; $lang['metasaveerr'] = 'אירע כשל בשמירת נתוני העל'; $lang['metasaveok'] = 'נתוני העל נשמרו'; -$lang['img_backto'] = 'חזרה אל'; +$lang['btn_img_backto'] = 'חזרה אל %s'; $lang['img_title'] = 'שם'; $lang['img_caption'] = 'כותרת'; $lang['img_date'] = 'תאריך'; @@ -256,7 +256,7 @@ $lang['img_camera'] = 'מצלמה'; $lang['img_keywords'] = 'מילות מפתח'; $lang['img_width'] = 'רוחב'; $lang['img_height'] = 'גובה'; -$lang['img_manager'] = 'צפה במנהל מדיה'; +$lang['btn_mediaManager'] = 'צפה במנהל מדיה'; $lang['subscr_subscribe_success'] = '%s נוסף לרשימת המינויים לדף %s'; $lang['subscr_subscribe_error'] = 'אירעה שגיאה בהוספת %s לרשימת המינויים לדף %s'; $lang['subscr_subscribe_noaddress'] = 'אין כתובת המשויכת עם הכניסה שלך, נא ניתן להוסיף אותך לרשימת המינויים'; diff --git a/inc/lang/hi/lang.php b/inc/lang/hi/lang.php index 184eeedbc..95c443ae9 100644 --- a/inc/lang/hi/lang.php +++ b/inc/lang/hi/lang.php @@ -103,7 +103,7 @@ $lang['qb_extlink'] = 'बाह्य कड़ी'; $lang['qb_hr'] = 'खड़ी रेखा'; $lang['qb_sig'] = 'हस्ताक्षर डालें'; $lang['admin_register'] = 'नया उपयोगकर्ता जोड़ें'; -$lang['img_backto'] = 'वापस जाना'; +$lang['btn_img_backto'] = 'वापस जाना %s'; $lang['img_title'] = 'शीर्षक'; $lang['img_caption'] = 'सहशीर्षक'; $lang['img_date'] = 'तिथि'; diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php index f19610827..544541ab2 100644 --- a/inc/lang/hr/lang.php +++ b/inc/lang/hr/lang.php @@ -204,7 +204,7 @@ $lang['admin_register'] = 'Dodaj novog korisnika'; $lang['metaedit'] = 'Uredi metapodatake'; $lang['metasaveerr'] = 'Neuspješno zapisivanje metapodataka'; $lang['metasaveok'] = 'Spremljeni metapdaci'; -$lang['img_backto'] = 'Povratak na'; +$lang['btn_img_backto'] = 'Povratak na %s'; $lang['img_title'] = 'Naziv'; $lang['img_caption'] = 'Naslov'; $lang['img_date'] = 'Datum'; diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php index a0aef9447..ad70438d9 100644 --- a/inc/lang/hu/lang.php +++ b/inc/lang/hu/lang.php @@ -243,7 +243,7 @@ $lang['admin_register'] = 'Új felhasználó'; $lang['metaedit'] = 'Metaadatok szerkesztése'; $lang['metasaveerr'] = 'A metaadatok írása nem sikerült'; $lang['metasaveok'] = 'Metaadatok elmentve'; -$lang['img_backto'] = 'Vissza'; +$lang['btn_img_backto'] = 'Vissza %s'; $lang['img_title'] = 'Cím'; $lang['img_caption'] = 'Képaláírás'; $lang['img_date'] = 'Dátum'; @@ -256,7 +256,7 @@ $lang['img_camera'] = 'Fényképezőgép típusa'; $lang['img_keywords'] = 'Kulcsszavak'; $lang['img_width'] = 'Szélesség'; $lang['img_height'] = 'Magasság'; -$lang['img_manager'] = 'Megtekintés a médiakezelőben'; +$lang['btn_mediaManager'] = 'Megtekintés a médiakezelőben'; $lang['subscr_subscribe_success'] = '%s hozzáadva az értesítési listához: %s'; $lang['subscr_subscribe_error'] = 'Hiba történt %s hozzáadásakor az értesítési listához: %s'; $lang['subscr_subscribe_noaddress'] = 'Nincs e-mail cím megadva az adataidnál, így a rendszer nem tudott hozzáadni az értesítési listához'; diff --git a/inc/lang/ia/lang.php b/inc/lang/ia/lang.php index 144dfe33b..1cc9bd8b5 100644 --- a/inc/lang/ia/lang.php +++ b/inc/lang/ia/lang.php @@ -202,7 +202,7 @@ $lang['admin_register'] = 'Adder nove usator'; $lang['metaedit'] = 'Modificar metadatos'; $lang['metasaveerr'] = 'Scriptura de metadatos fallite'; $lang['metasaveok'] = 'Metadatos salveguardate'; -$lang['img_backto'] = 'Retornar a'; +$lang['btn_img_backto'] = 'Retornar a %s'; $lang['img_title'] = 'Titulo'; $lang['img_caption'] = 'Legenda'; $lang['img_date'] = 'Data'; diff --git a/inc/lang/id/lang.php b/inc/lang/id/lang.php index 5cb5cb6ea..648aad865 100644 --- a/inc/lang/id/lang.php +++ b/inc/lang/id/lang.php @@ -186,7 +186,7 @@ $lang['admin_register'] = 'Tambah user baru'; $lang['metaedit'] = 'Edit Metadata'; $lang['metasaveerr'] = 'Gagal menulis metadata'; $lang['metasaveok'] = 'Metadata tersimpan'; -$lang['img_backto'] = 'Kembali ke'; +$lang['btn_img_backto'] = 'Kembali ke %s'; $lang['img_title'] = 'Judul'; $lang['img_caption'] = 'Label'; $lang['img_date'] = 'Tanggal'; diff --git a/inc/lang/is/lang.php b/inc/lang/is/lang.php index fbc7e9049..219431a42 100644 --- a/inc/lang/is/lang.php +++ b/inc/lang/is/lang.php @@ -170,7 +170,7 @@ $lang['admin_register'] = 'Setja nýjan notenda inn'; $lang['metaedit'] = 'Breyta lýsigögnum'; $lang['metasaveerr'] = 'Vistun lýsigagna mistókst'; $lang['metasaveok'] = 'Lýsigögn vistuð'; -$lang['img_backto'] = 'Aftur til'; +$lang['btn_img_backto'] = 'Aftur til %s'; $lang['img_title'] = 'Heiti'; $lang['img_caption'] = 'Skýringartexti'; $lang['img_date'] = 'Dagsetning'; diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php index a2bde3b60..eefcec9db 100644 --- a/inc/lang/it/lang.php +++ b/inc/lang/it/lang.php @@ -245,7 +245,7 @@ $lang['admin_register'] = 'Aggiungi un nuovo utente'; $lang['metaedit'] = 'Modifica metadati'; $lang['metasaveerr'] = 'Scrittura metadati fallita'; $lang['metasaveok'] = 'Metadati salvati'; -$lang['img_backto'] = 'Torna a'; +$lang['btn_img_backto'] = 'Torna a %s'; $lang['img_title'] = 'Titolo'; $lang['img_caption'] = 'Descrizione'; $lang['img_date'] = 'Data'; @@ -258,7 +258,7 @@ $lang['img_camera'] = 'Camera'; $lang['img_keywords'] = 'Parole chiave'; $lang['img_width'] = 'Larghezza'; $lang['img_height'] = 'Altezza'; -$lang['img_manager'] = 'Guarda nel gestore media'; +$lang['btn_mediaManager'] = 'Guarda nel gestore media'; $lang['subscr_subscribe_success'] = 'Aggiunto %s alla lista di sottoscrizioni %s'; $lang['subscr_subscribe_error'] = 'Impossibile aggiungere %s alla lista di sottoscrizioni %s'; $lang['subscr_subscribe_noaddress'] = 'Non esiste alcun indirizzo associato al tuo account, non puoi essere aggiunto alla lista di sottoscrizioni'; diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php index 1f53b0a90..782689fa3 100644 --- a/inc/lang/ja/lang.php +++ b/inc/lang/ja/lang.php @@ -240,7 +240,7 @@ $lang['admin_register'] = '新規ユーザー作成'; $lang['metaedit'] = 'メタデータ編集'; $lang['metasaveerr'] = 'メタデータの書き込みに失敗しました'; $lang['metasaveok'] = 'メタデータは保存されました'; -$lang['img_backto'] = '戻る'; +$lang['btn_img_backto'] = '戻る %s'; $lang['img_title'] = 'タイトル'; $lang['img_caption'] = '見出し'; $lang['img_date'] = '日付'; @@ -253,7 +253,7 @@ $lang['img_camera'] = '使用カメラ'; $lang['img_keywords'] = 'キーワード'; $lang['img_width'] = '幅'; $lang['img_height'] = '高さ'; -$lang['img_manager'] = 'メディアマネージャーで閲覧'; +$lang['btn_mediaManager'] = 'メディアマネージャーで閲覧'; $lang['subscr_subscribe_success'] = '%sが%sの購読リストに登録されました。'; $lang['subscr_subscribe_error'] = '%sを%sの購読リストへの追加に失敗しました。'; $lang['subscr_subscribe_noaddress'] = 'あなたのログインに対応するアドレスがないため、購読リストへ追加することができません。'; diff --git a/inc/lang/kk/lang.php b/inc/lang/kk/lang.php index 37b0f462b..4b111b118 100644 --- a/inc/lang/kk/lang.php +++ b/inc/lang/kk/lang.php @@ -123,7 +123,7 @@ $lang['yours'] = 'Сендердің болжамыңыз'; $lang['created'] = 'ЖасалFан'; $lang['mail_new_user'] = 'Жаңа пайдаланушы'; $lang['qb_chars'] = 'Арнайы белгiлер'; -$lang['img_backto'] = 'Қайта оралу'; +$lang['btn_img_backto'] = 'Қайта оралу %s'; $lang['img_format'] = 'Формат'; $lang['img_camera'] = 'Камера'; $lang['i_chooselang'] = 'Тіл таңдау'; diff --git a/inc/lang/km/lang.php b/inc/lang/km/lang.php index 4800b6c23..9f65ccd16 100644 --- a/inc/lang/km/lang.php +++ b/inc/lang/km/lang.php @@ -165,7 +165,7 @@ $lang['admin_register']= 'តែមអ្នកប្រើ';//'Add new user'; $lang['metaedit'] = 'កែទិន្នន័យអរូប';//'Edit Metadata'; $lang['metasaveerr'] = 'ពំអាចកត់រទិន្នន័យអរូប';//'Writing metadata failed'; $lang['metasaveok'] = 'ទិន្នន័យអរូប'; -$lang['img_backto'] = 'ថយក្រោយ'; +$lang['btn_img_backto'] = 'ថយក្រោយ%s'; $lang['img_title'] = 'អភិធេយ្យ'; $lang['img_caption'] = 'ចំណងជើង'; $lang['img_date'] = 'ថ្ងៃខែ';//'Date'; diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php index 266ff01e5..3a49dda7a 100644 --- a/inc/lang/ko/lang.php +++ b/inc/lang/ko/lang.php @@ -241,7 +241,7 @@ $lang['admin_register'] = '새 사용자 추가'; $lang['metaedit'] = '메타데이터 편집'; $lang['metasaveerr'] = '메타데이터 쓰기 실패'; $lang['metasaveok'] = '메타데이터 저장됨'; -$lang['img_backto'] = '뒤로'; +$lang['btn_img_backto'] = '뒤로 %s'; $lang['img_title'] = '제목'; $lang['img_caption'] = '설명'; $lang['img_date'] = '날짜'; @@ -254,7 +254,7 @@ $lang['img_camera'] = '카메라'; $lang['img_keywords'] = '키워드'; $lang['img_width'] = '너비'; $lang['img_height'] = '높이'; -$lang['img_manager'] = '미디어 관리자에서 보기'; +$lang['btn_mediaManager'] = '미디어 관리자에서 보기'; $lang['subscr_subscribe_success'] = '%s 사용자가 %s 구독 목록에 추가했습니다'; $lang['subscr_subscribe_error'] = '%s 사용자가 %s 구독 목록에 추가하는데 실패했습니다'; $lang['subscr_subscribe_noaddress'] = '로그인으로 연결된 주소가 없기 때문에 구독 목록에 추가할 수 없습니다'; diff --git a/inc/lang/ku/lang.php b/inc/lang/ku/lang.php index b6287806d..14f568b8e 100644 --- a/inc/lang/ku/lang.php +++ b/inc/lang/ku/lang.php @@ -127,7 +127,7 @@ $lang['admin_register']= 'Add new user...'; $lang['metaedit'] = 'Edit Metadata'; $lang['metasaveerr'] = 'Writing metadata failed'; $lang['metasaveok'] = 'Metadata saved'; -$lang['img_backto'] = 'Back to'; +$lang['btn_img_backto'] = 'Back to %s'; $lang['img_title'] = 'Title'; $lang['img_caption'] = 'Caption'; $lang['img_date'] = 'Date'; diff --git a/inc/lang/la/lang.php b/inc/lang/la/lang.php index c71a71bdd..691b303ed 100644 --- a/inc/lang/la/lang.php +++ b/inc/lang/la/lang.php @@ -202,7 +202,7 @@ $lang['admin_register'] = 'Nouom Sodalem creare'; $lang['metaedit'] = 'Res codicis mutare'; $lang['metasaveerr'] = 'Res codicis non scribitur.'; $lang['metasaveok'] = 'Res codicis seruatae.'; -$lang['img_backto'] = 'Redere ad'; +$lang['btn_img_backto'] = 'Redere ad %s'; $lang['img_title'] = 'Titulus'; $lang['img_caption'] = 'Descriptio'; $lang['img_date'] = 'Dies'; diff --git a/inc/lang/lb/lang.php b/inc/lang/lb/lang.php index 55113745a..efb98f679 100644 --- a/inc/lang/lb/lang.php +++ b/inc/lang/lb/lang.php @@ -162,7 +162,7 @@ $lang['admin_register'] = 'Neie Benotzer bäisetzen'; $lang['metaedit'] = 'Metadaten änneren'; $lang['metasaveerr'] = 'Feeler beim Schreiwe vun de Metadaten'; $lang['metasaveok'] = 'Metadate gespäichert'; -$lang['img_backto'] = 'Zeréck op'; +$lang['btn_img_backto'] = 'Zeréck op %s'; $lang['img_title'] = 'Titel'; $lang['img_caption'] = 'Beschreiwung'; $lang['img_date'] = 'Datum'; diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php index c38ea8838..74c8c88e9 100644 --- a/inc/lang/lt/lang.php +++ b/inc/lang/lt/lang.php @@ -163,7 +163,7 @@ $lang['admin_register'] = 'Sukurti naują vartotoją'; $lang['metaedit'] = 'Redaguoti metaduomenis'; $lang['metasaveerr'] = 'Nepavyko išsaugoti metaduomenų'; $lang['metasaveok'] = 'Metaduomenys išsaugoti'; -$lang['img_backto'] = 'Atgal į'; +$lang['btn_img_backto'] = 'Atgal į %s'; $lang['img_title'] = 'Pavadinimas'; $lang['img_caption'] = 'Antraštė'; $lang['img_date'] = 'Data'; diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php index 898125d60..91fed262e 100644 --- a/inc/lang/lv/lang.php +++ b/inc/lang/lv/lang.php @@ -228,7 +228,7 @@ $lang['admin_register'] = 'Pievienot jaunu lietotāju'; $lang['metaedit'] = 'Labot metadatus'; $lang['metasaveerr'] = 'Metadati nav saglabāti'; $lang['metasaveok'] = 'Metadati saglabāti'; -$lang['img_backto'] = 'Atpakaļ uz'; +$lang['btn_img_backto'] = 'Atpakaļ uz %s'; $lang['img_title'] = 'Virsraksts'; $lang['img_caption'] = 'Apraksts'; $lang['img_date'] = 'Datums'; @@ -241,7 +241,7 @@ $lang['img_camera'] = 'Fotoaparāts'; $lang['img_keywords'] = 'Atslēgvārdi'; $lang['img_width'] = 'Platums'; $lang['img_height'] = 'Augstums'; -$lang['img_manager'] = 'Skatīt mēdiju pārvaldniekā'; +$lang['btn_mediaManager'] = 'Skatīt mēdiju pārvaldniekā'; $lang['subscr_subscribe_success'] = '%s pievienots %s abonēšanas sarakstam'; $lang['subscr_subscribe_error'] = 'Kļūme pievienojot %s %s abonēšanas sarakstam.'; $lang['subscr_subscribe_noaddress'] = 'Nav zināma jūsu e-pasta adrese, tāpēc nevarat abonēt.'; diff --git a/inc/lang/mk/lang.php b/inc/lang/mk/lang.php index 2b2c9fb7f..6bf5fafc9 100644 --- a/inc/lang/mk/lang.php +++ b/inc/lang/mk/lang.php @@ -171,7 +171,7 @@ $lang['admin_register'] = 'Додај нов корисник'; $lang['metaedit'] = 'Уреди мета-податоци'; $lang['metasaveerr'] = 'Запишување на мета-податоците не успеа'; $lang['metasaveok'] = 'Мета-податоците се зачувани'; -$lang['img_backto'] = 'Назад до'; +$lang['btn_img_backto'] = 'Назад до %s'; $lang['img_title'] = 'Насловна линија'; $lang['img_caption'] = 'Наслов'; $lang['img_date'] = 'Датум'; diff --git a/inc/lang/mr/lang.php b/inc/lang/mr/lang.php index 54b69974d..ab84e7353 100644 --- a/inc/lang/mr/lang.php +++ b/inc/lang/mr/lang.php @@ -227,7 +227,7 @@ $lang['admin_register'] = 'नवीन सदस्य'; $lang['metaedit'] = 'मेटाडेटा बदला'; $lang['metasaveerr'] = 'मेटाडेटा सुरक्षित झाला नाही'; $lang['metasaveok'] = 'मेटाडेटा सुरक्षित झाला'; -$lang['img_backto'] = 'परत जा'; +$lang['btn_img_backto'] = 'परत जा %s'; $lang['img_title'] = 'नाव'; $lang['img_caption'] = 'टीप'; $lang['img_date'] = 'तारीख'; @@ -240,7 +240,7 @@ $lang['img_camera'] = 'कॅमेरा'; $lang['img_keywords'] = 'मुख्य शब्द'; $lang['img_width'] = 'रुंदी'; $lang['img_height'] = 'उंची'; -$lang['img_manager'] = 'मिडिया व्यवस्थापकात बघू'; +$lang['btn_mediaManager'] = 'मिडिया व्यवस्थापकात बघू'; $lang['authtempfail'] = 'सदस्य अधिकृत करण्याची सुविधा सध्या चालू नाही. सतत हा मजकूर दिसल्यास कृपया तुमच्या विकीच्या व्यवस्थापकाशी सम्पर्क साधा.'; $lang['i_chooselang'] = 'तुमची भाषा निवडा'; $lang['i_installer'] = 'डॉक्युविकि इनस्टॉलर'; diff --git a/inc/lang/ne/lang.php b/inc/lang/ne/lang.php index 7fd14d2c5..a7d694d5b 100644 --- a/inc/lang/ne/lang.php +++ b/inc/lang/ne/lang.php @@ -158,7 +158,7 @@ $lang['admin_register'] = 'नयाँ प्रयोगकर्ता $lang['metaedit'] = 'मेटाडेटा सम्पादन गर्नुहोस्'; $lang['metasaveerr'] = 'मेटाडाटा लेखन असफल'; $lang['metasaveok'] = 'मेटाडाटा वचत भयो '; -$lang['img_backto'] = 'फिर्ता'; +$lang['btn_img_backto'] = 'फिर्ता%s'; $lang['img_title'] = 'शिर्षक'; $lang['img_caption'] = 'निम्न लेख'; $lang['img_date'] = 'मिति'; diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php index e22aa9fff..42362661d 100644 --- a/inc/lang/nl/lang.php +++ b/inc/lang/nl/lang.php @@ -254,7 +254,7 @@ $lang['admin_register'] = 'Nieuwe gebruiker toevoegen'; $lang['metaedit'] = 'Metadata wijzigen'; $lang['metasaveerr'] = 'Schrijven van metadata mislukt'; $lang['metasaveok'] = 'Metadata bewaard'; -$lang['img_backto'] = 'Terug naar'; +$lang['btn_img_backto'] = 'Terug naar %s'; $lang['img_title'] = 'Titel'; $lang['img_caption'] = 'Bijschrift'; $lang['img_date'] = 'Datum'; @@ -267,7 +267,7 @@ $lang['img_camera'] = 'Camera'; $lang['img_keywords'] = 'Trefwoorden'; $lang['img_width'] = 'Breedte'; $lang['img_height'] = 'Hoogte'; -$lang['img_manager'] = 'In mediabeheerder bekijken'; +$lang['btn_mediaManager'] = 'In mediabeheerder bekijken'; $lang['subscr_subscribe_success'] = '%s is ingeschreven voor %s'; $lang['subscr_subscribe_error'] = 'Fout bij inschrijven van %s voor %s'; $lang['subscr_subscribe_noaddress'] = 'Er is geen e-mailadres gekoppeld aan uw account, u kunt daardoor niet worden ingeschreven.'; diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php index 3f31f6c73..cdf0effcc 100644 --- a/inc/lang/no/lang.php +++ b/inc/lang/no/lang.php @@ -251,7 +251,7 @@ $lang['admin_register'] = 'Legg til ny bruker'; $lang['metaedit'] = 'Rediger metadata'; $lang['metasaveerr'] = 'Skriving av metadata feilet'; $lang['metasaveok'] = 'Metadata lagret'; -$lang['img_backto'] = 'Tilbake til'; +$lang['btn_img_backto'] = 'Tilbake til %s'; $lang['img_title'] = 'Tittel'; $lang['img_caption'] = 'Bildetekst'; $lang['img_date'] = 'Dato'; @@ -264,7 +264,7 @@ $lang['img_camera'] = 'Kamera'; $lang['img_keywords'] = 'Nøkkelord'; $lang['img_width'] = 'Bredde'; $lang['img_height'] = 'Høyde'; -$lang['img_manager'] = 'Vis i mediefilbehandler'; +$lang['btn_mediaManager'] = 'Vis i mediefilbehandler'; $lang['subscr_subscribe_success'] = 'La til %s som abonnent på %s'; $lang['subscr_subscribe_error'] = 'Klarte ikke å legge til %s som abonnent på %s'; $lang['subscr_subscribe_noaddress'] = 'Brukeren din er ikke registrert med noen adresse. Du kan derfor ikke legges til som abonnent.'; diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php index e5f2d8d40..e65866761 100644 --- a/inc/lang/pl/lang.php +++ b/inc/lang/pl/lang.php @@ -247,7 +247,7 @@ $lang['admin_register'] = 'Dodawanie użytkownika'; $lang['metaedit'] = 'Edytuj metadane'; $lang['metasaveerr'] = 'Zapis metadanych nie powiódł się'; $lang['metasaveok'] = 'Metadane zapisano'; -$lang['img_backto'] = 'Wróć do'; +$lang['btn_img_backto'] = 'Wróć do %s'; $lang['img_title'] = 'Tytuł'; $lang['img_caption'] = 'Nagłówek'; $lang['img_date'] = 'Data'; @@ -260,7 +260,7 @@ $lang['img_camera'] = 'Aparat'; $lang['img_keywords'] = 'Słowa kluczowe'; $lang['img_width'] = 'Szerokość'; $lang['img_height'] = 'Wysokość'; -$lang['img_manager'] = 'Zobacz w menadżerze multimediów'; +$lang['btn_mediaManager'] = 'Zobacz w menadżerze multimediów'; $lang['subscr_subscribe_success'] = 'Dodano %s do listy subskrypcji %s'; $lang['subscr_subscribe_error'] = 'Błąd podczas dodawania %s do listy subskrypcji %s'; $lang['subscr_subscribe_noaddress'] = 'Brak adresu skojarzonego z twoim loginem, nie możesz zostać dodany(a) do listy subskrypcji'; diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php index 6845e792d..d5539f921 100644 --- a/inc/lang/pt-br/lang.php +++ b/inc/lang/pt-br/lang.php @@ -254,7 +254,7 @@ $lang['admin_register'] = 'Adicionar novo usuário'; $lang['metaedit'] = 'Editar metadados'; $lang['metasaveerr'] = 'Não foi possível escrever os metadados'; $lang['metasaveok'] = 'Os metadados foram salvos'; -$lang['img_backto'] = 'Voltar para'; +$lang['btn_img_backto'] = 'Voltar para %s'; $lang['img_title'] = 'Título'; $lang['img_caption'] = 'Descrição'; $lang['img_date'] = 'Data'; @@ -267,7 +267,7 @@ $lang['img_camera'] = 'Câmera'; $lang['img_keywords'] = 'Palavras-chave'; $lang['img_width'] = 'Largura'; $lang['img_height'] = 'Altura'; -$lang['img_manager'] = 'Ver no gerenciador de mídias'; +$lang['btn_mediaManager'] = 'Ver no gerenciador de mídias'; $lang['subscr_subscribe_success'] = 'Adicionado %s à lista de monitoramentos de %s'; $lang['subscr_subscribe_error'] = 'Ocorreu um erro na adição de %s à lista de monitoramentos de %s'; $lang['subscr_subscribe_noaddress'] = 'Como não há nenhum endereço associado ao seu usuário, você não pode ser adicionado à lista de monitoramento'; diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php index 46405c444..b2bb2dc34 100644 --- a/inc/lang/pt/lang.php +++ b/inc/lang/pt/lang.php @@ -233,7 +233,7 @@ $lang['admin_register'] = 'Registar Novo Utilizador'; $lang['metaedit'] = 'Editar Metadata'; $lang['metasaveerr'] = 'Falhou a escrita de Metadata'; $lang['metasaveok'] = 'Metadata gravada'; -$lang['img_backto'] = 'De volta a'; +$lang['btn_img_backto'] = 'De volta a %s'; $lang['img_title'] = 'Título'; $lang['img_caption'] = 'Legenda'; $lang['img_date'] = 'Data'; @@ -246,7 +246,7 @@ $lang['img_camera'] = 'Câmara'; $lang['img_keywords'] = 'Palavras-Chave'; $lang['img_width'] = 'Largura'; $lang['img_height'] = 'Altura'; -$lang['img_manager'] = 'Ver em gestor de media'; +$lang['btn_mediaManager'] = 'Ver em gestor de media'; $lang['subscr_subscribe_success'] = 'Adicionado %s à lista de subscrição para %s'; $lang['subscr_subscribe_error'] = 'Erro ao adicionar %s à lista de subscrição para %s'; $lang['subscr_subscribe_noaddress'] = 'Não existe endereço algum associado com o seu nome de utilizador, não pode ser adicionado à lista de subscrição'; diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php index 491ab58e7..31b2d7eba 100644 --- a/inc/lang/ro/lang.php +++ b/inc/lang/ro/lang.php @@ -232,7 +232,7 @@ $lang['admin_register'] = 'Adaugă utilizator nou'; $lang['metaedit'] = 'Editează metadata'; $lang['metasaveerr'] = 'Scrierea metadatelor a eșuat'; $lang['metasaveok'] = 'Metadatele au fost salvate'; -$lang['img_backto'] = 'Înapoi la'; +$lang['btn_img_backto'] = 'Înapoi la %s'; $lang['img_title'] = 'Titlu'; $lang['img_caption'] = 'Legendă'; $lang['img_date'] = 'Dată'; @@ -245,7 +245,7 @@ $lang['img_camera'] = 'Camera'; $lang['img_keywords'] = 'Cuvinte cheie'; $lang['img_width'] = 'Lățime'; $lang['img_height'] = 'Înălțime'; -$lang['img_manager'] = 'Vizualizează în administratorul media'; +$lang['btn_mediaManager'] = 'Vizualizează în administratorul media'; $lang['subscr_subscribe_success'] = 'Adăugat %s la lista de abonare pentru %s'; $lang['subscr_subscribe_error'] = 'Eroare la adăugarea %s la lista de abonare pentru %s'; $lang['subscr_subscribe_noaddress'] = 'Nu există adresă de e-mail asociată autentificării curente, nu poți fi adăugat la lista de abonare'; diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php index bf8fa34c8..9d35005bc 100644 --- a/inc/lang/ru/lang.php +++ b/inc/lang/ru/lang.php @@ -254,7 +254,7 @@ $lang['admin_register'] = 'Добавить пользователя'; $lang['metaedit'] = 'Править метаданные'; $lang['metasaveerr'] = 'Ошибка записи метаданных'; $lang['metasaveok'] = 'Метаданные сохранены'; -$lang['img_backto'] = 'Вернуться к'; +$lang['btn_img_backto'] = 'Вернуться к %s'; $lang['img_title'] = 'Название'; $lang['img_caption'] = 'Подпись'; $lang['img_date'] = 'Дата'; @@ -267,7 +267,7 @@ $lang['img_camera'] = 'Модель'; $lang['img_keywords'] = 'Ключевые слова'; $lang['img_width'] = 'Ширина'; $lang['img_height'] = 'Высота'; -$lang['img_manager'] = 'Просмотр в «управлении медиафайлами»'; +$lang['btn_mediaManager'] = 'Просмотр в «управлении медиафайлами»'; $lang['subscr_subscribe_success'] = 'Добавлен %s в подписку на %s'; $lang['subscr_subscribe_error'] = 'Невозможно добавить %s в подписку на %s'; $lang['subscr_subscribe_noaddress'] = 'Нет адреса электронной почты, сопоставленного с вашей учётной записью. Вы не можете подписаться на рассылку'; diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php index aa823b074..3ba220a2d 100644 --- a/inc/lang/sk/lang.php +++ b/inc/lang/sk/lang.php @@ -238,7 +238,7 @@ $lang['admin_register'] = 'Pridaj nového užívateľa'; $lang['metaedit'] = 'Upraviť metainformácie'; $lang['metasaveerr'] = 'Zápis metainformácií zlyhal'; $lang['metasaveok'] = 'Metainformácie uložené'; -$lang['img_backto'] = 'Späť na'; +$lang['btn_img_backto'] = 'Späť na %s'; $lang['img_title'] = 'Titul'; $lang['img_caption'] = 'Popis'; $lang['img_date'] = 'Dátum'; @@ -251,7 +251,7 @@ $lang['img_camera'] = 'Fotoaparát'; $lang['img_keywords'] = 'Kľúčové slová'; $lang['img_width'] = 'Šírka'; $lang['img_height'] = 'Výška'; -$lang['img_manager'] = 'Prezrieť v správcovi médií'; +$lang['btn_mediaManager'] = 'Prezrieť v správcovi médií'; $lang['subscr_subscribe_success'] = 'Používateľ %s bol pridaný do zoznamu hlásení o zmenách %s'; $lang['subscr_subscribe_error'] = 'Chyba pri pridaní používateľa %s do zoznamu hlásení o zmenách %s'; $lang['subscr_subscribe_noaddress'] = 'Vaše prihlasovacie meno nemá priradenú žiadnu email adresu, nemôžete byť pridaný do zoznamu hlásení o zmenách'; diff --git a/inc/lang/sl/lang.php b/inc/lang/sl/lang.php index c9a47927d..6de260092 100644 --- a/inc/lang/sl/lang.php +++ b/inc/lang/sl/lang.php @@ -235,7 +235,7 @@ $lang['admin_register'] = 'Dodaj novega uporabnika'; $lang['metaedit'] = 'Uredi metapodatke'; $lang['metasaveerr'] = 'Zapisovanje metapodatkov je spodletelo'; $lang['metasaveok'] = 'Metapodatki so shranjeni'; -$lang['img_backto'] = 'Nazaj na'; +$lang['btn_img_backto'] = 'Nazaj na %s'; $lang['img_title'] = 'Naslov'; $lang['img_caption'] = 'Opis'; $lang['img_date'] = 'Datum'; @@ -248,7 +248,7 @@ $lang['img_camera'] = 'Fotoaparat'; $lang['img_keywords'] = 'Ključne besede'; $lang['img_width'] = 'Širina'; $lang['img_height'] = 'Višina'; -$lang['img_manager'] = 'Poglej v urejevalniku predstavnih vsebin'; +$lang['btn_mediaManager'] = 'Poglej v urejevalniku predstavnih vsebin'; $lang['subscr_subscribe_success'] = 'Uporabniški račun %s je dodan na seznam naročnin na %s'; $lang['subscr_subscribe_error'] = 'Napaka med dodajanjem %s na seznam naročnin na %s'; $lang['subscr_subscribe_noaddress'] = 'S trenutnimi prijavnimi podatki ni povezanega elektronskega naslova, zato uporabniškega računa ni mogoče dodati na seznam naročnikov.'; diff --git a/inc/lang/sq/lang.php b/inc/lang/sq/lang.php index 2ed62ed4e..c31cdd360 100644 --- a/inc/lang/sq/lang.php +++ b/inc/lang/sq/lang.php @@ -179,7 +179,7 @@ $lang['admin_register'] = 'Shto Përdorues të Ri'; $lang['metaedit'] = 'Redakto Metadata'; $lang['metasaveerr'] = 'Shkrimi i metadata-ve dështoi'; $lang['metasaveok'] = 'Metadata u ruajt'; -$lang['img_backto'] = 'Mbrapa te'; +$lang['btn_img_backto'] = 'Mbrapa te %s'; $lang['img_title'] = 'Titulli '; $lang['img_caption'] = 'Titra'; $lang['img_date'] = 'Data'; diff --git a/inc/lang/sr/lang.php b/inc/lang/sr/lang.php index 7c434cbc9..4b44704ad 100644 --- a/inc/lang/sr/lang.php +++ b/inc/lang/sr/lang.php @@ -201,7 +201,7 @@ $lang['admin_register'] = 'Додај новог корисника'; $lang['metaedit'] = 'Измени мета-податке'; $lang['metasaveerr'] = 'Записивање мета-података није било успешно'; $lang['metasaveok'] = 'Мета-подаци су сачувани'; -$lang['img_backto'] = 'Натраг на'; +$lang['btn_img_backto'] = 'Натраг на %s'; $lang['img_title'] = 'Наслов'; $lang['img_caption'] = 'Назив'; $lang['img_date'] = 'Датум'; diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php index 8c8858f61..c057d8705 100644 --- a/inc/lang/sv/lang.php +++ b/inc/lang/sv/lang.php @@ -249,7 +249,7 @@ $lang['admin_register'] = 'Lägg till ny användare'; $lang['metaedit'] = 'Redigera metadata'; $lang['metasaveerr'] = 'Skrivning av metadata misslyckades'; $lang['metasaveok'] = 'Metadata sparad'; -$lang['img_backto'] = 'Tillbaka till'; +$lang['btn_img_backto'] = 'Tillbaka till %s'; $lang['img_title'] = 'Rubrik'; $lang['img_caption'] = 'Bildtext'; $lang['img_date'] = 'Datum'; @@ -262,7 +262,7 @@ $lang['img_camera'] = 'Kamera'; $lang['img_keywords'] = 'Nyckelord'; $lang['img_width'] = 'Bredd'; $lang['img_height'] = 'Höjd'; -$lang['img_manager'] = 'Se mediahanteraren'; +$lang['btn_mediaManager'] = 'Se mediahanteraren'; $lang['subscr_subscribe_success'] = 'La till %s till prenumerationslista %s'; $lang['subscr_subscribe_noaddress'] = 'Det finns ingen adress associerad med din inloggning, du kan inte bli tillagd i prenumerationslistan'; $lang['subscr_unsubscribe_success'] = '%s borttagen från prenumerationslistan för %s'; diff --git a/inc/lang/th/lang.php b/inc/lang/th/lang.php index 5d364166b..8aebfe1a5 100644 --- a/inc/lang/th/lang.php +++ b/inc/lang/th/lang.php @@ -181,7 +181,7 @@ $lang['admin_register'] = 'สร้างบัญชีผู้ใช $lang['metaedit'] = 'แก้ไขข้อมูลเมต้า'; $lang['metasaveerr'] = 'มีข้อผิดพลาดในการเขียนข้อมูลเมต้า'; $lang['metasaveok'] = 'บันทึกเมต้าดาต้าแล้ว'; -$lang['img_backto'] = 'กลับไปยัง'; +$lang['btn_img_backto'] = 'กลับไปยัง %s'; $lang['img_title'] = 'ชื่อภาพ'; $lang['img_caption'] = 'คำบรรยายภาพ'; $lang['img_date'] = 'วันที่'; diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php index 210a82530..2af17fe27 100644 --- a/inc/lang/tr/lang.php +++ b/inc/lang/tr/lang.php @@ -233,7 +233,7 @@ $lang['admin_register'] = 'Yeni kullanıcı ekle...'; $lang['metaedit'] = 'Metaverileri Değiştir'; $lang['metasaveerr'] = 'Metaveri yazma başarısız '; $lang['metasaveok'] = 'Metaveri kaydedildi'; -$lang['img_backto'] = 'Şuna dön:'; +$lang['btn_img_backto'] = 'Şuna dön: %s'; $lang['img_title'] = 'Başlık'; $lang['img_caption'] = 'Serlevha'; $lang['img_date'] = 'Tarih'; @@ -246,7 +246,7 @@ $lang['img_camera'] = 'Fotoğraf Makinası'; $lang['img_keywords'] = 'Anahtar Sözcükler'; $lang['img_width'] = 'Genişlik'; $lang['img_height'] = 'Yükseklik'; -$lang['img_manager'] = 'Ortam oynatıcısında göster'; +$lang['btn_mediaManager'] = 'Ortam oynatıcısında göster'; $lang['subscr_m_new_header'] = 'Üyelik ekle'; $lang['subscr_m_current_header'] = 'Üyeliğini onayla'; $lang['subscr_m_unsubscribe'] = 'Üyelik iptali'; diff --git a/inc/lang/uk/lang.php b/inc/lang/uk/lang.php index 4e91e82a2..09b2b6d1d 100644 --- a/inc/lang/uk/lang.php +++ b/inc/lang/uk/lang.php @@ -223,7 +223,7 @@ $lang['admin_register'] = 'Додати нового користувач $lang['metaedit'] = 'Редагувати метадані'; $lang['metasaveerr'] = 'Помилка запису метаданих'; $lang['metasaveok'] = 'Метадані збережено'; -$lang['img_backto'] = 'Повернутися до'; +$lang['btn_img_backto'] = 'Повернутися до %s'; $lang['img_title'] = 'Назва'; $lang['img_caption'] = 'Підпис'; $lang['img_date'] = 'Дата'; diff --git a/inc/lang/vi/lang.php b/inc/lang/vi/lang.php index d8e40f875..ccc179eec 100644 --- a/inc/lang/vi/lang.php +++ b/inc/lang/vi/lang.php @@ -192,7 +192,7 @@ $lang['qb_sig'] = 'Đặt chữ ký'; $lang['metaedit'] = 'Sửa Metadata'; $lang['metasaveerr'] = 'Thất bại khi viết metadata'; $lang['metasaveok'] = 'Metadata đã được lưu'; -$lang['img_backto'] = 'Quay lại'; +$lang['btn_img_backto'] = 'Quay lại %s'; $lang['img_title'] = 'Tiêu đề'; $lang['img_caption'] = 'Ghi chú'; $lang['img_date'] = 'Ngày'; @@ -205,7 +205,7 @@ $lang['img_camera'] = 'Camera'; $lang['img_keywords'] = 'Từ khóa'; $lang['img_width'] = 'Rộng'; $lang['img_height'] = 'Cao'; -$lang['img_manager'] = 'Xem trong trình quản lý tệp media'; +$lang['btn_mediaManager'] = 'Xem trong trình quản lý tệp media'; $lang['i_chooselang'] = 'Chọn ngôn ngữ'; $lang['i_retry'] = 'Thử lại'; $lang['years'] = 'cách đây %d năm'; diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php index 456377810..84afec97a 100644 --- a/inc/lang/zh-tw/lang.php +++ b/inc/lang/zh-tw/lang.php @@ -243,7 +243,7 @@ $lang['admin_register'] = '新增使用者'; $lang['metaedit'] = '編輯後設資料'; $lang['metasaveerr'] = '後設資料無法寫入'; $lang['metasaveok'] = '後設資料已儲存'; -$lang['img_backto'] = '回上一頁'; +$lang['btn_img_backto'] = '回上一頁 %s'; $lang['img_title'] = '標題'; $lang['img_caption'] = '照片說明'; $lang['img_date'] = '日期'; @@ -256,7 +256,7 @@ $lang['img_camera'] = '相機'; $lang['img_keywords'] = '關鍵字'; $lang['img_width'] = '寬度'; $lang['img_height'] = '高度'; -$lang['img_manager'] = '在多媒體管理器中檢視'; +$lang['btn_mediaManager'] = '在多媒體管理器中檢視'; $lang['subscr_subscribe_success'] = '已將 %s 加入至 %s 的訂閱列表'; $lang['subscr_subscribe_error'] = '將 %s 加入至 %s 的訂閱列表時發生錯誤'; $lang['subscr_subscribe_noaddress'] = '沒有與您登入相關的地址，無法將您加入訂閱列表'; diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php index 8777c65a5..86c2ac20c 100644 --- a/inc/lang/zh/lang.php +++ b/inc/lang/zh/lang.php @@ -253,7 +253,7 @@ $lang['admin_register'] = '添加新用户'; $lang['metaedit'] = '编辑元数据'; $lang['metasaveerr'] = '写入元数据失败'; $lang['metasaveok'] = '元数据已保存'; -$lang['img_backto'] = '返回到'; +$lang['btn_img_backto'] = '返回到 %s'; $lang['img_title'] = '标题'; $lang['img_caption'] = '说明'; $lang['img_date'] = '日期'; @@ -266,7 +266,7 @@ $lang['img_camera'] = '相机'; $lang['img_keywords'] = '关键字'; $lang['img_width'] = '宽度'; $lang['img_height'] = '高度'; -$lang['img_manager'] = '在媒体管理器中查看'; +$lang['btn_mediaManager'] = '在媒体管理器中查看'; $lang['subscr_subscribe_success'] = '添加 %s 到 %s 的订阅列表'; $lang['subscr_subscribe_error'] = '添加 %s 到 %s 的订阅列表中出现错误'; $lang['subscr_subscribe_noaddress'] = '没有与您登录信息相关联的地址，您无法被添加到订阅列表'; diff --git a/inc/template.php b/inc/template.php index 1bf6b45b2..4b1188c95 100644 --- a/inc/template.php +++ b/inc/template.php @@ -550,6 +550,7 @@ function tpl_actionlink($type, $pre = '', $suf = '', $inner = '', $return = fals * @var string $method * @var bool $nofollow * @var array $params + * @var string $replacement */ extract($data); if(strpos($id, '#') === 0) { @@ -558,6 +559,9 @@ function tpl_actionlink($type, $pre = '', $suf = '', $inner = '', $return = fals $linktarget = wl($id, $params); } $caption = $lang['btn_'.$type]; + if(strpos($caption, '%s')){ + $caption = sprintf($caption, $replacement); + } $akey = $addTitle = ''; if($accesskey) { $akey = 'accesskey="'.$accesskey.'" '; @@ -613,11 +617,12 @@ function tpl_get_action($type) { if ($type == 'subscription') $type = 'subscribe'; if(!actionOK($type)) return false; - $accesskey = null; - $id = $ID; - $method = 'get'; - $params = array('do' => $type); - $nofollow = true; + $accesskey = null; + $id = $ID; + $method = 'get'; + $params = array('do' => $type); + $nofollow = true; + $replacement = ''; switch($type) { case 'edit': // most complicated type - we need to decide on current action @@ -674,6 +679,11 @@ function tpl_get_action($type) { $params = array('do' => ''); $accesskey = 'b'; break; + case 'img_backto': + $params = array(); + $accesskey = 'b'; + $replacement = $ID; + break; case 'login': $params['sectok'] = getSecurityToken(); if($INPUT->server->has('REMOTE_USER')) { @@ -721,11 +731,26 @@ function tpl_get_action($type) { case 'media': $params['ns'] = getNS($ID); break; + case 'mediaManager': + // View image in media manager + global $IMG; + $imgNS = getNS($IMG); + $authNS = auth_quickaclcheck("$imgNS:*"); + if ($authNS < AUTH_UPLOAD) { + return false; + } + $params = array( + 'ns' => $imgNS, + 'image' => $IMG, + 'do' => 'media' + ); + //$type = 'media'; + break; default: return '[unknown %s type]'; break; } - return compact('accesskey', 'type', 'id', 'method', 'params', 'nofollow'); + return compact('accesskey', 'type', 'id', 'method', 'params', 'nofollow', 'replacement'); } /** @@ -1024,6 +1049,67 @@ function tpl_img_getTag($tags, $alt = '', $src = null) { } /** + * Returns a description list of the metatags of the current image + * + * @return string html of description list + */ +function tpl_img_meta() { + global $lang; + + $tags = tpl_get_img_meta(); + + echo '<dl>'; + foreach($tags as $tag) { + $label = $lang[$tag['langkey']]; + if(!$label) $label = $tag['langkey']; + + echo '<dt>'.$label.':</dt><dd>'; + if ($tag['type'] == 'date') { + echo dformat($tag['value']); + } else { + echo hsc($tag['value']); + } + echo '</dd>'; + } + echo '</dl>'; +} + +/** + * Returns metadata as configured in mediameta config file, ready for creating html + * + * @return array with arrays containing the entries: + * - string langkey key to lookup in the $lang var, if not found printed as is + * - string type type of value + * - string value tag value (unescaped) + */ +function tpl_get_img_meta() { + + $config_files = getConfigFiles('mediameta'); + foreach ($config_files as $config_file) { + if(@file_exists($config_file)) { + include($config_file); + } + } + /** @var array $fields the included array with metadata */ + + $tags = array(); + foreach($fields as $tag){ + $t = array(); + if (!empty($tag[0])) { + $t = array($tag[0]); + } + if(is_array($tag[3])) { + $t = array_merge($t,$tag[3]); + } + $value = tpl_img_getTag($t); + if ($value) { + $tags[] = array('langkey' => $tag[1], 'type' => $tag[2], 'value' => $value); + } + } + return $tags; +} + +/** * Prints the image with a link to the full sized version * * Only allowed in: detail.php diff --git a/lib/tpl/dokuwiki/css/pagetools.less b/lib/tpl/dokuwiki/css/pagetools.less index ecb3038c3..77d2670a6 100644 --- a/lib/tpl/dokuwiki/css/pagetools.less +++ b/lib/tpl/dokuwiki/css/pagetools.less @@ -231,3 +231,4 @@ .pagetools-item(subscribe, 9, subscribe); .pagetools-item(mediaManager, 11); .pagetools-item(back, 12); +.pagetools-item(img_backto, 12); diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index ec846f6fd..8fe2c88a2 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -55,37 +55,7 @@ header('X-UA-Compatible: IE=edge,chrome=1'); <?php tpl_img(900,700); /* parameters: maximum width, maximum height (and more) */ ?> <div class="img_detail"> - <dl> - <?php - // @todo: logic should be transferred to backend - $config_files = getConfigFiles('mediameta'); - foreach ($config_files as $config_file) { - if(@file_exists($config_file)) { - include($config_file); - } - } - - foreach($fields as $key => $tag){ - $t = array(); - if (!empty($tag[0])) { - $t = array($tag[0]); - } - if(is_array($tag[3])) { - $t = array_merge($t,$tag[3]); - } - $value = tpl_img_getTag($t); - if ($value) { - echo '<dt>'.$lang[$tag[1]].':</dt><dd>'; - if ($tag[2] == 'date') { - echo dformat($value); - } else { - echo hsc($value); - } - echo '</dd>'; - } - } - ?> - </dl> + <?php tpl_img_meta(); ?> </div> <?php //Comment in for Debug// dbg(tpl_img_getTag('Simple.Raw'));?> <?php endif; ?> @@ -109,23 +79,17 @@ header('X-UA-Compatible: IE=edge,chrome=1'); <div class="tools"> <ul> <?php - $data = array(); - $data['view'] = 'detail'; - - // View in media manager; @todo: transfer logic to backend - $imgNS = getNS($IMG); - $authNS = auth_quickaclcheck("$imgNS:*"); - if (($authNS >= AUTH_UPLOAD) && function_exists('media_managerURL')) { - $mmURL = media_managerURL(array('ns' => $imgNS, 'image' => $IMG)); - $data['items']['mediaManager'] = '<li><a href="'.$mmURL.'" class="mediaManager"><span>'.$lang['img_manager'].'</span></a></li>'; - } - - // Back to [ID]; @todo: transfer logic to backend - $data['items']['img_backto'] = '<li><a href="'.wl($ID).'" class="back"><span>'.$lang['img_backto'].' '.$ID.'</span></a></li>'; + $data = array( + 'view' => 'detail', + 'items' => array( + 'mediaManager' => tpl_action('mediaManager', 1, 'li', 1, '<span>', '</span>'), + 'img_backto' => tpl_action('img_backto', 1, 'li', 1, '<span>', '</span>'), + ) + ); // the page tools can be amended through a custom plugin hook $evt = new Doku_Event('TEMPLATE_PAGETOOLS_DISPLAY', $data); - if($evt->advise_before()){ + if($evt->advise_before()) { foreach($evt->data['items'] as $k => $html) echo $html; } $evt->advise_after(); |