From e6f70eafdd2eeace1f0dd620873a22db6c008485 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Sat, 20 Jun 2015 22:21:18 +1000 Subject: [PATCH] Translate prompt for FileUpload + MediaFinder Remove redundant language key Recompile assets --- modules/backend/assets/js/october-min.js | 4 +++- modules/backend/formwidgets/FileUpload.php | 10 ++-------- modules/backend/lang/de/lang.php | 1 - modules/backend/lang/en/lang.php | 4 ++-- modules/backend/lang/es-ar/lang.php | 1 - modules/backend/lang/es/lang.php | 1 - modules/backend/lang/fa/lang.php | 1 - modules/backend/lang/fr/lang.php | 1 - modules/backend/lang/hu/lang.php | 1 - modules/backend/lang/id/lang.php | 1 - modules/backend/lang/it/lang.php | 1 - modules/backend/lang/ja/lang.php | 1 - modules/backend/lang/lv/lang.php | 1 - modules/backend/lang/nb-no/lang.php | 1 - modules/backend/lang/nl/lang.php | 1 - modules/backend/lang/pl/lang.php | 1 - modules/backend/lang/pt-br/lang.php | 1 - modules/backend/lang/ro/lang.php | 1 - modules/backend/lang/ru/lang.php | 1 - modules/backend/lang/sv/lang.php | 1 - modules/backend/lang/tr/lang.php | 1 - modules/backend/lang/zh-cn/lang.php | 1 - modules/cms/formwidgets/MediaFinder.php | 4 ++-- modules/cms/lang/en/lang.php | 3 +++ 24 files changed, 12 insertions(+), 32 deletions(-) diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js index a699dd805..0b899036b 100644 --- a/modules/backend/assets/js/october-min.js +++ b/modules/backend/assets/js/october-min.js @@ -5061,7 +5061,9 @@ data[option].apply(data,methodArgs)}})} $.fn.sidenavTree.Constructor=SidenavTree $.fn.sidenavTree.noConflict=function(){$.fn.sidenavTree=old return this} -$(document).ready(function(){$('[data-control=sidenav-tree]').sidenavTree()})}(window.jQuery);$(window).on('ajaxErrorMessage',function(event,message){if(!message)return +$(document).ready(function(){$('[data-control=sidenav-tree]').sidenavTree()})}(window.jQuery);$.ajaxPrefilter(function(options){var token=$('meta[name="csrf-token"]').attr('content') +if(token){options.headers['X-CSRF-TOKEN']=token}}) +$(window).on('ajaxErrorMessage',function(event,message){if(!message)return swal({title:message,confirmButtonClass:'btn-default'}) event.preventDefault()}) $(window).on('ajaxConfirmMessage',function(event,message){if(!message)return diff --git a/modules/backend/formwidgets/FileUpload.php b/modules/backend/formwidgets/FileUpload.php index aad122e85..176abff48 100644 --- a/modules/backend/formwidgets/FileUpload.php +++ b/modules/backend/formwidgets/FileUpload.php @@ -35,7 +35,7 @@ class FileUpload extends FormWidgetBase /** * @var string Prompt to display if no record is selected. */ - public $prompt = 'Click the %s or drag a file here to upload'; + public $prompt = 'backend::lang.fileupload.default_prompt'; /** * @var int Preview image width @@ -47,11 +47,6 @@ class FileUpload extends FormWidgetBase */ public $imageHeight = null; - /** - * @var string Text to display when no file is associated - */ - public $previewNoFilesMessage = 'backend::lang.form.preview_no_files_message'; - /** * @var mixed Collection of acceptable file types. */ @@ -93,7 +88,6 @@ class FileUpload extends FormWidgetBase 'prompt', 'imageWidth', 'imageHeight', - 'previewNoFilesMessage', 'fileTypes', 'mimeTypes', 'thumbOptions', @@ -126,7 +120,7 @@ class FileUpload extends FormWidgetBase $this->vars['acceptedFileTypes'] = $this->getAcceptedFileTypes(true); $this->vars['cssDimensions'] = $this->getCssDimensions(); $this->vars['useCaption'] = $this->useCaption; - $this->vars['prompt'] = str_replace('%s', '', $this->prompt); + $this->vars['prompt'] = str_replace('%s', '', trans($this->prompt)); } protected function getFileList() diff --git a/modules/backend/lang/de/lang.php b/modules/backend/lang/de/lang.php index e696b38c2..ffa4a3d01 100644 --- a/modules/backend/lang/de/lang.php +++ b/modules/backend/lang/de/lang.php @@ -156,7 +156,6 @@ return [ 'or' => 'or', 'confirm_tab_close' => 'Wollen Sie den Tab wirklich schließen? Ungespeicherte Änderungen gehen verloren.', 'behavior_not_ready' => 'Formularverhalten kann nicht initialisiert werden, überprüfen Sie den Aufruf von makeLists() in Ihrem Controller.', - 'preview_no_files_message' => 'Keine Dateien wurden hochgeladen', 'select' => 'Auswählen', 'select_all' => 'Alle', 'select_none' => 'Keine', diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php index f9015d2e9..8eac78da1 100644 --- a/modules/backend/lang/en/lang.php +++ b/modules/backend/lang/en/lang.php @@ -143,7 +143,8 @@ return [ 'attachment' => 'Attachment', 'help' => 'Add a title and description for this attachment.', 'title_label' => 'Title', - 'description_label' => 'Description' + 'description_label' => 'Description', + 'default_prompt' => 'Click the %s or drag a file here to upload' ], 'form' => [ 'create_title' => 'New :name', @@ -184,7 +185,6 @@ return [ 'or' => 'or', 'confirm_tab_close' => 'Do you really want to close the tab? Unsaved changes will be lost.', 'behavior_not_ready' => 'Form behavior has not been initialized, check that you have called initForm() in your controller.', - 'preview_no_files_message' => 'Files are not uploaded', 'select' => 'Select', 'select_all' => 'all', 'select_none' => 'none', diff --git a/modules/backend/lang/es-ar/lang.php b/modules/backend/lang/es-ar/lang.php index e8e401b95..621ddea23 100644 --- a/modules/backend/lang/es-ar/lang.php +++ b/modules/backend/lang/es-ar/lang.php @@ -159,7 +159,6 @@ return [ 'or' => 'o', 'confirm_tab_close' => '¿Realmente desea cerrar la cuenta? Se perderán los cambios no guardados.', 'behavior_not_ready' => 'Favor compruebe que ha llamado a la funcion initForm() en el controlador.', - 'preview_no_files_message' => 'Los archivos no fueron cargados', 'select' => 'Seleccionar', 'select_all' => 'Todo', 'select_none' => 'Nada', diff --git a/modules/backend/lang/es/lang.php b/modules/backend/lang/es/lang.php index 5d1447534..3ebecc4a1 100644 --- a/modules/backend/lang/es/lang.php +++ b/modules/backend/lang/es/lang.php @@ -161,7 +161,6 @@ return [ 'or' => 'o', 'confirm_tab_close' => '¿Realmente desea cerrar la pestaña? Se perderán los cambios no guardados.', 'behavior_not_ready' => 'El comportamiento del formulario no se ha inicializado, compruebe que ha llamado initForm() en el controlador.', - 'preview_no_files_message' => 'Los archivos no se han subido', 'select' => 'Seleccionar', 'select_all' => 'todos', 'select_none' => 'ninguno', diff --git a/modules/backend/lang/fa/lang.php b/modules/backend/lang/fa/lang.php index 9223020c1..211319db8 100644 --- a/modules/backend/lang/fa/lang.php +++ b/modules/backend/lang/fa/lang.php @@ -167,7 +167,6 @@ return [ 'or' => 'یا', 'confirm_tab_close' => 'در صورت بستن این پنجره موارد ذخیره نشده از بین خواهند رفت. آیا از حذف شدن این پنجره اطمینان دارید؟', 'behavior_not_ready' => 'فرم مور نظر مقدار دهی اولیه نشده است ، بررسی کنید که متد initForm() در کنترلر فرتخوانی شده باشد.', - 'preview_no_files_message' => 'فایل ها ارسال نشدند', 'select' => 'انتخاب', 'select_all' => 'همه', 'select_none' => 'هیچ', diff --git a/modules/backend/lang/fr/lang.php b/modules/backend/lang/fr/lang.php index 58271ea19..d7ead07d5 100644 --- a/modules/backend/lang/fr/lang.php +++ b/modules/backend/lang/fr/lang.php @@ -180,7 +180,6 @@ return [ 'or' => 'ou', 'confirm_tab_close' => 'Confirmer la fermeture de cet onglet ? Les modifications réalisées seront perdues.', 'behavior_not_ready' => 'Le formulaire n’a pas encore été initialisé, vérifier que la méthode d’appel de initForm() a été soumise au contrôleur.', - 'preview_no_files_message' => 'Les fichiers ne sont pas envoyés.', 'select' => 'Sélectionner', 'select_all' => 'tout', 'select_none' => 'aucun', diff --git a/modules/backend/lang/hu/lang.php b/modules/backend/lang/hu/lang.php index c1dbc8324..1ae9aa6a9 100644 --- a/modules/backend/lang/hu/lang.php +++ b/modules/backend/lang/hu/lang.php @@ -180,7 +180,6 @@ return [ 'or' => 'vagy', 'confirm_tab_close' => 'Valóban be akarja zárni a fület? El fognak veszni a nem mentett módosítások.', 'behavior_not_ready' => 'Nem történt meg az űrlapviselkedés inicializálása, ellenőrizze, hogy meghívta-e az initForm() függvényt a vezérlőben.', - 'preview_no_files_message' => 'A fájlok nincsenek feltöltve', 'select' => 'Válasszon', 'select_all' => 'mind', 'select_none' => 'egyik sem', diff --git a/modules/backend/lang/id/lang.php b/modules/backend/lang/id/lang.php index f858c4709..83093930d 100644 --- a/modules/backend/lang/id/lang.php +++ b/modules/backend/lang/id/lang.php @@ -180,7 +180,6 @@ return [ 'or' => 'atau', 'confirm_tab_close' => 'Anda yakin akan menutup tab? Perubahan belum tersimpan akan hilang.', 'behavior_not_ready' => 'Behavior borang belum diinisialisasi, periksa apakah Anda telah memanggil initForm() pada controller Anda.', - 'preview_no_files_message' => 'Berkas tidak terunggah', 'select' => 'Pilih', 'select_all' => 'semua', 'select_none' => 'tiada', diff --git a/modules/backend/lang/it/lang.php b/modules/backend/lang/it/lang.php index caa35a56f..0c391a67d 100644 --- a/modules/backend/lang/it/lang.php +++ b/modules/backend/lang/it/lang.php @@ -145,7 +145,6 @@ return [ 'or' => 'o', 'confirm_tab_close' => 'Vuoi davvero chiudere il tab? Le modifiche non salvate andranno perse.', 'behavior_not_ready' => 'Il form non è stato inizializzato, verifica di aver chiamato il metodo initForm() nel controller.', - 'preview_no_files_message' => 'I file non sono stati caricati', 'select' => 'Seleziona', 'select_all' => 'tutti', 'select_none' => 'nessuno', diff --git a/modules/backend/lang/ja/lang.php b/modules/backend/lang/ja/lang.php index bce7b076d..d929498ed 100644 --- a/modules/backend/lang/ja/lang.php +++ b/modules/backend/lang/ja/lang.php @@ -176,7 +176,6 @@ return [ 'or' => 'または', 'confirm_tab_close' => '本当にタブを閉じますか？ 保存されていない変更は消えてしまいます。', 'behavior_not_ready' => 'フォームビヘイビアーは初期化されていません。コントローラーでinitForm()を呼び出しているか確認してください。', - 'preview_no_files_message' => 'ファイルはアップロードされません。', 'select' => '選択', 'select_all' => 'すべて', 'select_none' => 'なし', diff --git a/modules/backend/lang/lv/lang.php b/modules/backend/lang/lv/lang.php index 091e6e6e8..d501b24b3 100644 --- a/modules/backend/lang/lv/lang.php +++ b/modules/backend/lang/lv/lang.php @@ -180,7 +180,6 @@ return [ 'or' => 'vai', 'confirm_tab_close' => 'Vai tiešām vēlaties aizvērt šo cilni? Nesaglabātās izmaiņas būs zudušas.', 'behavior_not_ready' => 'Forma nav tikusi inicializēta, pārbaudiet vai izsaucāt initForm() savā kontrolierī.', - 'preview_no_files_message' => 'Faili nav augšupielādēti', 'select' => 'Izvēlēties', 'select_all' => 'visus', 'select_none' => 'nevienu', diff --git a/modules/backend/lang/nb-no/lang.php b/modules/backend/lang/nb-no/lang.php index f0f3cc97a..ca24a21f3 100644 --- a/modules/backend/lang/nb-no/lang.php +++ b/modules/backend/lang/nb-no/lang.php @@ -181,7 +181,6 @@ return [ 'or' => 'eller', 'confirm_tab_close' => 'Vil du virkelig lukke fanen? Endringer som ikke er lagret vil gå tapt.', 'behavior_not_ready' => 'Skjemaegenskap har ikke blitt initialisert, sjekk at du har kalt initForm() i kontrolleren.', - 'preview_no_files_message' => 'Filer er ikke opplastet', 'select' => 'Velg', 'select_all' => 'alle', 'select_none' => 'ingen', diff --git a/modules/backend/lang/nl/lang.php b/modules/backend/lang/nl/lang.php index 067c48126..887f08a09 100644 --- a/modules/backend/lang/nl/lang.php +++ b/modules/backend/lang/nl/lang.php @@ -158,7 +158,6 @@ return [ 'or' => 'of', 'confirm_tab_close' => 'Weet je zeker dat je dit tabblad wilt sluiten? Niet opgeslagen wijzigingen gaan verloren.', 'behavior_not_ready' => 'Gedrag (behavior) van het formulier is niet geladen. Controleer of initForm() in de controller is aangeroepen.', - 'preview_no_files_message' => 'Bestanden zijn niet geüploadet', 'select' => 'Selecteer', 'select_all' => 'alles', 'select_none' => 'niets', diff --git a/modules/backend/lang/pl/lang.php b/modules/backend/lang/pl/lang.php index 36a372cfd..4cf5233e9 100644 --- a/modules/backend/lang/pl/lang.php +++ b/modules/backend/lang/pl/lang.php @@ -176,7 +176,6 @@ return [ 'or' => 'lub', 'confirm_tab_close' => 'Czy naprawdę chcesz zamknąć tą kartę? Wszystkie niezapisane zmiany zostaną utracone.', 'behavior_not_ready' => 'Zachowanie formularza nie zostało zainicjowane, sprawdź czy wywołałeś initForm() w swoim kontrolerze.', - 'preview_no_files_message' => 'Pliki nie są wysyłane', 'select' => 'Zaznacz', 'select_all' => 'wszystkie', 'select_none' => 'żadne', diff --git a/modules/backend/lang/pt-br/lang.php b/modules/backend/lang/pt-br/lang.php index 44e4dafdb..d04952998 100644 --- a/modules/backend/lang/pt-br/lang.php +++ b/modules/backend/lang/pt-br/lang.php @@ -180,7 +180,6 @@ return [ 'or' => 'ou', 'confirm_tab_close' => 'Tem certeza que deseja fechar essa aba? As alterações que não foram salvas serão perdidas', 'behavior_not_ready' => 'O formulário não foi inicializado. Confira se você chamou initForm() no controller.', - 'preview_no_files_message' => 'Os arquivos não foram carregados', 'select' => 'Selecionar', 'select_all' => 'todos', 'select_none' => 'nenhum', diff --git a/modules/backend/lang/ro/lang.php b/modules/backend/lang/ro/lang.php index dede7394d..52f3a7642 100644 --- a/modules/backend/lang/ro/lang.php +++ b/modules/backend/lang/ro/lang.php @@ -147,7 +147,6 @@ return [ 'or' => 'sau', 'confirm_tab_close' => 'Sunteti sigur(a) ca doriti sa inchideti acest tab? Modificarile nesalvate vor fi pierdute.', 'behavior_not_ready' => 'Setarile initiale ale formularului nu au fost definite, verificati existenta functiei initForm() in controller.', - 'preview_no_files_message' => 'Fisierele nu au fost incarcate', 'select' => 'Selectare', 'select_all' => 'toate', 'select_none' => 'niciunul', diff --git a/modules/backend/lang/ru/lang.php b/modules/backend/lang/ru/lang.php index ec4921fc8..13caba182 100644 --- a/modules/backend/lang/ru/lang.php +++ b/modules/backend/lang/ru/lang.php @@ -181,7 +181,6 @@ return [ 'or' => 'или', 'confirm_tab_close' => 'Закрыть вкладку? Несохраненные изменения будут потеряны.', 'behavior_not_ready' => 'Поведение формы не было инициализировано, проверьте вызов initForm() в вашем контроллере.', - 'preview_no_files_message' => 'Файлы не загружены', 'select' => 'Выбрать', 'select_all' => 'все', 'select_none' => 'ничего', diff --git a/modules/backend/lang/sv/lang.php b/modules/backend/lang/sv/lang.php index a58a6e13b..2bce33698 100644 --- a/modules/backend/lang/sv/lang.php +++ b/modules/backend/lang/sv/lang.php @@ -180,7 +180,6 @@ return [ 'or' => 'eller', 'confirm_tab_close' => 'Vill du verkligen stänga fliken? Ej sparade ändringar kommer gå förlorade', 'behavior_not_ready' => 'Formuläregenskap har ej blivit initierad, kontrollera att du anropat initForm() i din controller', - 'preview_no_files_message' => 'Filen är inte uppladdad', 'select' => 'Välj', 'select_all' => 'alla', 'select_none' => 'ingen', diff --git a/modules/backend/lang/tr/lang.php b/modules/backend/lang/tr/lang.php index 35e226109..c4532333c 100644 --- a/modules/backend/lang/tr/lang.php +++ b/modules/backend/lang/tr/lang.php @@ -176,7 +176,6 @@ return [ 'or' => 'veya', 'confirm_tab_close' => 'Bu sekmeyi kapatmak istediğinize emin misiniz? Kaydedilmemiş değişiklikleri kaybedeceksiniz.', 'behavior_not_ready' => 'Form oluşturulamadı, controller da initForm() metodunu kontrol edin.', - 'preview_no_files_message' => 'Dosyalar yüklenmedi', 'select' => 'Seç', 'select_all' => 'tümü', 'select_none' => 'hiçbiri', diff --git a/modules/backend/lang/zh-cn/lang.php b/modules/backend/lang/zh-cn/lang.php index 3e2aba9e8..679c79bdf 100644 --- a/modules/backend/lang/zh-cn/lang.php +++ b/modules/backend/lang/zh-cn/lang.php @@ -180,7 +180,6 @@ return [ 'or' => '或', 'confirm_tab_close' => '你真的想要关闭这个标签吗? 未保存的改变会丢失.', 'behavior_not_ready' => '表单还没初始化, 确保你调用了controller中的 initForm().', - 'preview_no_files_message' => '文件没有上传', 'select' => '选择', 'select_all' => 'all', 'select_none' => 'none', diff --git a/modules/cms/formwidgets/MediaFinder.php b/modules/cms/formwidgets/MediaFinder.php index 9a6e47b71..ee7b990d0 100644 --- a/modules/cms/formwidgets/MediaFinder.php +++ b/modules/cms/formwidgets/MediaFinder.php @@ -26,7 +26,7 @@ class MediaFinder extends FormWidgetBase /** * @var string Prompt to display if no record is selected. */ - public $prompt = 'Click the %s button to find a media item'; + public $prompt = 'cms::lang.mediafinder.default_prompt'; /** * @var string Display mode for the selection. Values: file, image. @@ -71,7 +71,7 @@ class MediaFinder extends FormWidgetBase $this->vars['value'] = $value; $this->vars['imageUrl'] = $value ? MediaLibrary::url($value) : ''; $this->vars['field'] = $this->formField; - $this->vars['prompt'] = str_replace('%s', '', $this->prompt); + $this->vars['prompt'] = str_replace('%s', '', trans($this->prompt)); $this->vars['mode'] = $this->mode; } diff --git a/modules/cms/lang/en/lang.php b/modules/cms/lang/en/lang.php index f2437f19a..39bfb63b1 100644 --- a/modules/cms/lang/en/lang.php +++ b/modules/cms/lang/en/lang.php @@ -233,6 +233,9 @@ return [ 'manage_partials' => 'Manage partials', 'manage_themes' => 'Manage themes' ], + 'mediafinder' => [ + 'default_prompt' => 'Click the %s button to find a media item' + ], 'media' => [ 'invalid_path' => "Invalid file path specified: ':path'.", 'menu_label' => 'Media',