From 57c7f2ac09a42775f21e48dfead2619b41d037c9 Mon Sep 17 00:00:00 2001 From: Mike Ng Date: Wed, 30 May 2018 16:11:24 +0400 Subject: [PATCH] refactor notice on mapboxgl map and add title to dialog --- .../Controller/Prod/LanguageController.php | 3 +- resources/locales/messages.de.xlf | 25 +++-- resources/locales/messages.en.xlf | 90 ++++++++---------- resources/locales/messages.fr.xlf | 25 +++-- resources/locales/messages.nl.xlf | 25 +++-- resources/locales/validators.de.xlf | 2 +- resources/locales/validators.en.xlf | 2 +- resources/locales/validators.fr.xlf | 2 +- resources/locales/validators.nl.xlf | 2 +- .../common/images/icons/button-close-gray.png | Bin 0 -> 308 bytes ...ormation-grey.png => information-grey.png} | Bin 11 files changed, 93 insertions(+), 83 deletions(-) create mode 100644 resources/www/common/images/icons/button-close-gray.png rename resources/www/common/images/icons/{Information-grey.png => information-grey.png} (100%) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php b/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php index c8e2aef7f1..a29146cac7 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php @@ -151,7 +151,8 @@ class LanguageController 'No hover to chapter' => $translator->trans('prod:edit: no overlaps for chapters'), 'suggested_values' => $translator->trans('prod:edit: suggested_values'), 'title notice' => $translator->trans('prod:mapboxgl: title notice'), - 'description notice' => $translator->trans('prod:mapboxgl: description notice') + 'description notice' => $translator->trans('prod:mapboxgl: description notice'), + 'title-map-dialog' => $translator->trans('prod:mapboxgl: title map dialog'), ]); } } diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index ba8e0181a6..0ba30acae4 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.de.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -1257,12 +1257,12 @@ Audio Samplerate Audio Samplerate - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Audio codec Audio codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php AudioSamplerate @@ -1828,7 +1828,7 @@ Colorspace Colorspace - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Commande @@ -3251,7 +3251,7 @@ FlashFired FlashFired - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Flatten layers @@ -3310,7 +3310,7 @@ FrameRate FrameRate - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Frequence d'echantillonage @@ -4226,7 +4226,7 @@ MimeType MimeType - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Minimum number of letters before truncation @@ -4737,7 +4737,7 @@ Orientation Orientation - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Original name @@ -6030,7 +6030,7 @@ Shutter speed Verschlusszeit - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -7247,7 +7247,7 @@ Video codec Video codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Videos @@ -11281,6 +11281,11 @@ prod:mapboxgl: description notice Controller/Prod/LanguageController.php + + prod:mapboxgl: title map dialog + prod:mapboxgl: title map dialog + Controller/Prod/LanguageController.php + prod:mapboxgl: title notice prod:mapboxgl: title notice diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 9b14eb5397..f66f40b5ec 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.en.xlf @@ -1,15 +1,14 @@ - + - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.
- - - Form/Login/PhraseaAuthenticationForm.php + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php @@ -1258,12 +1257,12 @@ Audio Samplerate Audio Samplerate - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Audio codec Audio codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php AudioSamplerate @@ -1829,7 +1828,7 @@ Colorspace Colorspace - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Commande @@ -3252,7 +3251,7 @@ FlashFired FlashFired - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Flatten layers @@ -3311,7 +3310,7 @@ FrameRate FrameRate - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Frequence d'echantillonage @@ -4227,7 +4226,7 @@ MimeType MimeType - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Minimum number of letters before truncation @@ -4738,7 +4737,7 @@ Orientation Orientation - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Original name @@ -6031,7 +6030,7 @@ Shutter speed Shutter speed - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -7248,7 +7247,7 @@ Video codec Video codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Videos @@ -9477,11 +9476,6 @@ Subview Type web/admin/subdefs.html.twig - - create_subdef_modal_mediatype - Media Type - web/admin/subdefs.html.twig - create_subdef_modal_presets Presets @@ -9502,11 +9496,6 @@ Subview Name web/admin/subdefs.html.twig - - create_subdef_modal_subviewType - Subview Type - web/admin/subdefs.html.twig - dans %category% in %category% @@ -9815,7 +9804,7 @@ Remove advanced search filters. prod/results/help.html.twig - + help::help-section-bullet: search-in-a-specific-field To search in a specific field, use syntaxe "name of field: value", exemple: city:"Paris" See documentation for more examples https://docs.phraseanet.com @@ -9873,17 +9862,17 @@ See documentation for more examples https://docs.phraseanet.com Facets Preferences web/prod/index.html.twig - + index::advance_search: facet-order Facets order web/prod/index.html.twig - + index::advance_search: facet-tech-order default order web/prod/index.html.twig - + index::advance_search: facet-values-order facets value order web/prod/index.html.twig @@ -10155,7 +10144,7 @@ See documentation for more examples https://docs.phraseanet.com Your Order Of : prod/orders/order_item.html.twig - + order-manager::order-item: accepted-item accepted item prod/orders/order_item.html.twig @@ -10247,7 +10236,7 @@ See documentation for more examples https://docs.phraseanet.com prod/orders/order_item.html.twig prod/orders/order_item.html.twig - + order-manager::order-item: rejected-item rejected item prod/orders/order_item.html.twig @@ -10264,7 +10253,7 @@ See documentation for more examples https://docs.phraseanet.com Select All prod/orders/order_item.html.twig - + order-manager::order-item: selected-item selected item prod/orders/order_item.html.twig @@ -11233,7 +11222,7 @@ See documentation for more examples https://docs.phraseanet.com Replace with term ? web/prod/tab_thesaurus.html.twig - + prod::toolbar : video editor video tool web/prod/toolbar.html.twig @@ -11249,12 +11238,12 @@ See documentation for more examples https://docs.phraseanet.com also move record prod/actions/delete_records_confirm.html.twig - + prod:app trash: record-delete record delete prod/actions/delete_records_confirm.html.twig - + prod:app trash: record-move-to-trash move record to trash prod/actions/delete_records_confirm.html.twig @@ -11264,27 +11253,27 @@ See documentation for more examples https://docs.phraseanet.com prod:app trash: title-trash Controller/Prod/LanguageController.php - + prod:edit: chapters Edit chapters Controller/Prod/LanguageController.php - + prod:edit: no overlaps for chapters No overlaps for chapters Controller/Prod/LanguageController.php - + prod:edit: only a media of type video can be edited Only a media of type video can be edited Controller/Prod/LanguageController.php - + prod:edit: suggested_values Suggested values Controller/Prod/LanguageController.php - + prod:edit: video-editor Video tools Controller/Prod/LanguageController.php @@ -11294,6 +11283,11 @@ See documentation for more examples https://docs.phraseanet.com prod:mapboxgl: description notice Controller/Prod/LanguageController.php + + prod:mapboxgl: title map dialog + prod:mapboxgl: title map dialog + Controller/Prod/LanguageController.php + prod:mapboxgl: title notice prod:mapboxgl: title notice @@ -12392,12 +12386,12 @@ See documentation for more examples https://docs.phraseanet.com E-mails send test web/admin/dashboard.html.twig - + setup::custom-link:add-link Add link web/admin/setup.html.twig - + setup::custom-link:help-menu Help Menu Form/Configuration/CustomLinkFormType.php @@ -12407,7 +12401,7 @@ See documentation for more examples https://docs.phraseanet.com Show in language web/admin/setup.html.twig - + setup::custom-link:link-url Destination URL web/admin/setup.html.twig @@ -12417,18 +12411,18 @@ See documentation for more examples https://docs.phraseanet.com setup::custom-link:location Form/Configuration/CustomLinkFormType.php - + setup::custom-link:location-link Select Placement ... web/admin/setup.html.twig - + setup::custom-link:name-link Name of link Form/Configuration/CustomLinkFormType.php web/admin/setup.html.twig - + setup::custom-link:navigation-bar Navigation Bar Form/Configuration/CustomLinkFormType.php @@ -12438,12 +12432,12 @@ See documentation for more examples https://docs.phraseanet.com Order web/admin/setup.html.twig - + setup::custom-link:placeholder-link-url eg: https://docs.phraseanet.com Form/Configuration/CustomLinkFormType.php - + setup::custom-link:select-language Select Language Form/Configuration/CustomLinkFormType.php @@ -13327,7 +13321,7 @@ See documentation for more examples https://docs.phraseanet.com web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig - + video range extractor Video Chapter Editing actions/Tools/videoEditor.html.twig diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index d68715a9b1..7c17a2e33f 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -1257,12 +1257,12 @@ Audio Samplerate Audio Samplerate - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Audio codec Audio codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php AudioSamplerate @@ -1828,7 +1828,7 @@ Colorspace Colorspace - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Commande @@ -3251,7 +3251,7 @@ FlashFired FlashFired - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Flatten layers @@ -3310,7 +3310,7 @@ FrameRate FrameRate - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Frequence d'echantillonage @@ -4226,7 +4226,7 @@ MimeType MimeType - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Minimum number of letters before truncation @@ -4737,7 +4737,7 @@ Orientation Orientation - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Original name @@ -6032,7 +6032,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Shutter speed Vitesse d'obturateur - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -7249,7 +7249,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Video codec Video codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Videos @@ -11285,6 +11285,11 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le prod:mapboxgl: description notice Controller/Prod/LanguageController.php + + prod:mapboxgl: title map dialog + prod:mapboxgl: title map dialog + Controller/Prod/LanguageController.php + prod:mapboxgl: title notice prod:mapboxgl: title notice diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index d98f86ad66..e9ab082917 100644 --- a/resources/locales/messages.nl.xlf +++ b/resources/locales/messages.nl.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -1261,12 +1261,12 @@ Audio Samplerate Audio Samplerate - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Audio codec Audio codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php AudioSamplerate @@ -1832,7 +1832,7 @@ Colorspace Colorspace - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Commande @@ -3255,7 +3255,7 @@ FlashFired FlashFired - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Flatten layers @@ -3314,7 +3314,7 @@ FrameRate FrameRate - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Frequence d'echantillonage @@ -4230,7 +4230,7 @@ MimeType MimeType - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Minimum number of letters before truncation @@ -4741,7 +4741,7 @@ Orientation Orientation - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Original name @@ -6034,7 +6034,7 @@ Shutter speed Sluitersnelheid - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -7251,7 +7251,7 @@ Video codec Video codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Videos @@ -11285,6 +11285,11 @@ prod:mapboxgl: description notice Controller/Prod/LanguageController.php + + prod:mapboxgl: title map dialog + prod:mapboxgl: title map dialog + Controller/Prod/LanguageController.php + prod:mapboxgl: title notice prod:mapboxgl: title notice diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index c9ecbd4a25..534a132348 100644 --- a/resources/locales/validators.de.xlf +++ b/resources/locales/validators.de.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.en.xlf b/resources/locales/validators.en.xlf index 7064828f35..5ec87182ec 100644 --- a/resources/locales/validators.en.xlf +++ b/resources/locales/validators.en.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.fr.xlf b/resources/locales/validators.fr.xlf index 449aaf1772..6c21e47db8 100644 --- a/resources/locales/validators.fr.xlf +++ b/resources/locales/validators.fr.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.nl.xlf b/resources/locales/validators.nl.xlf index 6240f87edd..01e9f82098 100644 --- a/resources/locales/validators.nl.xlf +++ b/resources/locales/validators.nl.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/www/common/images/icons/button-close-gray.png b/resources/www/common/images/icons/button-close-gray.png new file mode 100644 index 0000000000000000000000000000000000000000..44999a6106d85c27e5ba55a195fb76a92dc761b5 GIT binary patch literal 308 zcmV-40n7f0P)Px#?ny*JR45f~kx>qUFbsw%3a8LG4`TEgUO1vh;DvXL2XRJE0Wq^*rDlmXfo$#9 zzyG$P>$*^QG)$Yv9up}iS_rgIwVw%k)jp& z5wxY0HVz1aIw7c50B{9Hk0d-O@RiW6`=ymK!%Jb6&nS_=B1!Fj;*4DB?YPnX%Vlwu z+#)0e?T%(w_eU-TNtXg5P@Ly^RCuS`i(oO&)lQee zjJ8t(vt|lHFoZqQztI%`S+)08rKmUZbKu2Fpiy7`jK~`@HM