From c4d33f5f551a252f6c71bc04244dda7f7c4ca821 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Wed, 11 Mar 2020 16:59:44 +0400 Subject: [PATCH 1/6] PHRAS-2978 #comment Workzone basket: fix date format and tooltip display --- lib/classes/phraseadate.php | 53 ++++++++++++++++++++ templates/web/prod/Tooltip/Basket.html.twig | 19 +++---- templates/web/prod/WorkZone/Basket.html.twig | 2 +- 3 files changed, 64 insertions(+), 10 deletions(-) diff --git a/lib/classes/phraseadate.php b/lib/classes/phraseadate.php index c501eadd5d..7d71c3445a 100644 --- a/lib/classes/phraseadate.php +++ b/lib/classes/phraseadate.php @@ -119,6 +119,59 @@ class phraseadate } } + /** + * + * @param DateTime $date + * @return string + */ + public function getLocalDate(DateTime $date = null) + { + if (is_null($date)) { + return null; + } + + $compareTo = new DateTime('now'); + $diff = $compareTo->format('U') - $date->format('U'); + $currentYear = $date->format('Y'); + $dayDiff = floor($diff / 86400); + + if (is_nan($dayDiff) || $dayDiff > 365000) { + return ''; + } + + + + $date_string_Y = new IntlDateFormatter($this->app['locale'], NULL, NULL, NULL, NULL, 'dd MMMM yyyy'); + // $date_string_M = new IntlDateFormatter($this->app['locale'], NULL, NULL, NULL, NULL, 'dd MMMM'); + + if ($dayDiff == 0) { + if ($diff < 60) { + return $this->app->trans('phraseanet::temps:: a l\'instant'); + } elseif ($diff < 120) { + return $this->app->trans('phraseanet::temps:: il y a une minute'); + } elseif ($diff < 3600) { + return $this->app->trans('phraseanet::temps:: il y a %quantity% minutes', ['%quantity%' => floor($diff / 60)]); + } elseif ($diff < 7200) { + return $this->app->trans('phraseanet::temps:: il y a une heure'); + } elseif ($diff < 86400) { + return $this->app->trans('phraseanet::temps:: il y a %quantity% heures', ['%quantity%' => floor($diff / 3600)]); + } + } elseif ($dayDiff == 1) { + return $this->app->trans('phraseanet::temps:: hier'); + + }else { + // current year + /* if (date('Y')== $currentYear) { + return $date_string_M->format($date); + }*/ + //return $date_string_Y->format($date); + } + + + + return $date_string_Y->format($date); + } + /** * * @param DateTime $date diff --git a/templates/web/prod/Tooltip/Basket.html.twig b/templates/web/prod/Tooltip/Basket.html.twig index efd82d2c8f..f35dfa0091 100644 --- a/templates/web/prod/Tooltip/Basket.html.twig +++ b/templates/web/prod/Tooltip/Basket.html.twig @@ -8,21 +8,22 @@ {% block content %}
+ + {% if basket.getValidation() %} + {% set dateExpired = app['date-formatter'].getLocalDate(basket.getValidation().getExpires()) %} + {{ 'workzone:feedback:expiration' | trans }} : {{ dateExpired }} + {% endif %} +
{{ basket.getDescription()|nl2br }}
{% set nb_records = basket.getElements()|length %} - {% set date = app['date-formatter'].getPrettyString(basket.getUpdated()) %} - - {% if basket.getValidation() %} - {% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %} - {{ 'workzone:feedback:expiration' | trans }} : {{ dateExpired }} - {% endif %} - -
+ {% set date = app['date-formatter'].getLocalDate(basket.getUpdated()) %} + +
{% trans with {'%nb_records%' : nb_records} %}%nb_records% records{% endtrans %} - - {{ date }} + - {{ 'prod:workzone:basket:creation-date' | trans }} : {{ date }}
diff --git a/templates/web/prod/WorkZone/Basket.html.twig b/templates/web/prod/WorkZone/Basket.html.twig index 524665ea03..68613370ef 100644 --- a/templates/web/prod/WorkZone/Basket.html.twig +++ b/templates/web/prod/WorkZone/Basket.html.twig @@ -89,7 +89,7 @@ {% endif %}
{% if basket.getValidation() %} - {% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %} + {% set dateExpired = app['date-formatter'].getLocalDate(basket.getValidation().getExpires()) %} {{ 'workzone:feedback:expiration' | trans }} : {{ dateExpired }} {% endif %} From d1df992136447f1511646dcaf7efdb9a0514cbac Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Wed, 11 Mar 2020 17:04:20 +0400 Subject: [PATCH 2/6] PHRAS-2978 add translation --- resources/locales/messages.de.xlf | 94 ++++++++++++---------- resources/locales/messages.en.xlf | 120 +++++++++++++++------------- resources/locales/messages.fr.xlf | 120 +++++++++++++++------------- resources/locales/messages.nl.xlf | 94 ++++++++++++---------- resources/locales/validators.de.xlf | 2 +- resources/locales/validators.en.xlf | 2 +- resources/locales/validators.fr.xlf | 2 +- resources/locales/validators.nl.xlf | 2 +- 8 files changed, 238 insertions(+), 198 deletions(-) diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index 6d303f8141..e098ee4b2f 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. @@ -117,7 +117,7 @@ %basket_length% documents %basket_length% Dokument(e) - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/index.html.twig web/lightbox/index.html.twig @@ -193,7 +193,7 @@ %nb_records% records %nb_records% Datensätze prod/Tooltip/Story.html.twig - prod/Tooltip/Basket.html.twig + prod/Tooltip/Basket.html.twig %nb_view% vue @@ -1397,10 +1397,10 @@ Back Zurück mobile/lightbox/basket_element.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/validate.html.twig Back to Feedback @@ -2302,7 +2302,7 @@ Deconnexion Abmeldung - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig Decouvrez la documentation @@ -2566,8 +2566,7 @@ Do you want to send your report ? Möchten Sie Ihren Bericht senden ? Phrasea/Controller/LightboxController.php - mobile/lightbox/validate.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig Document @@ -3619,7 +3618,7 @@ Hautpseite mobile/lightbox/basket_element.html.twig mobile/lightbox/feed.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig login/include/language-block.html.twig login/layout/base-layout.html.twig @@ -4900,12 +4899,12 @@ Paniers Sammelkörbe - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/account/account.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Par %author% @@ -7333,11 +7332,11 @@ Validations Bestätigung - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Validations received @@ -7408,13 +7407,13 @@ Voici vos paniers Ihre Sammelkörbe - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig Voici vos validations en cours Hier sind Ihre aktuellen Bewertungen - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig @@ -7978,8 +7977,8 @@ a propos Über - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig action : ajouter au panier @@ -8023,7 +8022,7 @@ web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig action : outils @@ -9431,7 +9430,7 @@ web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig boutton::tester @@ -10114,14 +10113,14 @@ lightbox::list lightbox::list - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig lightbox::recaptitulatif Übersicht - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/agreement_box.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox::see_less_basket @@ -10136,44 +10135,44 @@ lightbox:feedback:sendreport:warnwindows:cancel lightbox:feedback:sendreport:warnwindows:cancel - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:message lightbox:feedback:sendreport:warnwindows:message - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:record_approved lightbox:feedback:sendreport:warnwindows:record_approved - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:record_rejected lightbox:feedback:sendreport:warnwindows:record_rejected - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:record_unexpressed lightbox:feedback:sendreport:warnwindows:record_unexpressed - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:title lightbox:feedback:sendreport:warnwindows:title - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:validate lightbox:feedback:sendreport:warnwindows:validate - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig login:: Changer mon adresse email @@ -11059,31 +11058,37 @@ phraseanet::temps:: a l'instant gerade lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: hier gestern lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% heures vor %quantity% Stunde lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% minutes vor %quantity% Minuten lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une heure vor einer Stunde lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une minute vor einer Minute lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::time:: a @@ -11716,6 +11721,11 @@ Auswahl entfernen prod/actions/Push.html.twig + + prod:workzone:basket:creation-date + prod:workzone:basket:creation-date + prod/Tooltip/Basket.html.twig + prod:workzone:facetstab:search_and_facets_sort_options prod:workzone:facetstab:search_and_facets_sort_options @@ -13359,8 +13369,8 @@ validation::envoyer mon rapport Meinen Bericht senden - mobile/lightbox/validate.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/basket_options.html.twig web/lightbox/basket_options.html.twig @@ -13394,7 +13404,7 @@ workzone:feedback:expiration workzone:feedback:expiration prod/WorkZone/Basket.html.twig - prod/Tooltip/Basket.html.twig + prod/Tooltip/Basket.html.twig yes diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 9b111627c1..4b88c83382 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.en.xlf @@ -1,14 +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 @@ -117,7 +117,7 @@ %basket_length% documents %basket_length% document(s) - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/index.html.twig web/lightbox/index.html.twig @@ -193,7 +193,7 @@ %nb_records% records %nb_records% records prod/Tooltip/Story.html.twig - prod/Tooltip/Basket.html.twig + prod/Tooltip/Basket.html.twig %nb_view% vue @@ -1398,10 +1398,10 @@ Back Previous mobile/lightbox/basket_element.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/validate.html.twig Back to Feedback @@ -2305,7 +2305,7 @@ Deconnexion Logout - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig Decouvrez la documentation @@ -2569,8 +2569,7 @@ Do you want to send your report ? Send your Report ? Phrasea/Controller/LightboxController.php - mobile/lightbox/validate.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig Document @@ -3622,7 +3621,7 @@ Home mobile/lightbox/basket_element.html.twig mobile/lightbox/feed.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig login/include/language-block.html.twig login/layout/base-layout.html.twig @@ -4903,12 +4902,12 @@ Paniers Baskets - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/account/account.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Par %author% @@ -7336,11 +7335,11 @@ Validations Feedbacks - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Validations received @@ -7411,13 +7410,13 @@ Voici vos paniers Your Basket(s) - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig Voici vos validations en cours Your feedbacks in progress - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig @@ -7981,8 +7980,8 @@ a propos About - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig action : ajouter au panier @@ -8026,7 +8025,7 @@ web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig action : outils @@ -9434,7 +9433,7 @@ web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig boutton::tester @@ -10117,14 +10116,14 @@ lightbox::list Summary - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig lightbox::recaptitulatif Summary - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/agreement_box.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox::see_less_basket @@ -10136,47 +10135,47 @@ See more baskets web/lightbox/index.html.twig - + lightbox:feedback:sendreport:warnwindows:cancel Cancel report sending and continue - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig - + lightbox:feedback:sendreport:warnwindows:message Your feedback contains - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig - + lightbox:feedback:sendreport:warnwindows:record_approved Approved - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:record_rejected Rejected - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig - + lightbox:feedback:sendreport:warnwindows:record_unexpressed Unexpressed - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig - + lightbox:feedback:sendreport:warnwindows:title Feedback summary - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/validate.html.twig - + lightbox:feedback:sendreport:warnwindows:validate Send my report - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig login:: Changer mon adresse email @@ -11062,31 +11061,37 @@ phraseanet::temps:: a l'instant Just now lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: hier Yesterday lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% heures %quantity% hours ago lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% minutes %quantity% minutes ago lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une heure One hour ago lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une minute One minute ago lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::time:: a @@ -11722,22 +11727,27 @@ It is possible to place several search areas Delete Selection prod/actions/Push.html.twig + + prod:workzone:basket:creation-date + prod:workzone:basket:creation-date + prod/Tooltip/Basket.html.twig + prod:workzone:facetstab:search_and_facets_sort_options Option web/prod/index.html.twig - + prod:workzone:facetstab:tooltips:facet_and_filter Include into results web/prod/index.html.twig - + prod:workzone:facetstab:tooltips:facet_except_filter Exclude form results web/prod/index.html.twig - + prod:workzone:facetstab:tooltips:remove_facet_filter Remove filter web/prod/index.html.twig @@ -13365,8 +13375,8 @@ It is possible to place several search areas validation::envoyer mon rapport Send my feedback - mobile/lightbox/validate.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/basket_options.html.twig web/lightbox/basket_options.html.twig @@ -13396,11 +13406,11 @@ It is possible to place several search areas Thumbnail Tools actions/Tools/videoEditor.html.twig - + workzone:feedback:expiration Feedback open Until prod/WorkZone/Basket.html.twig - prod/Tooltip/Basket.html.twig + prod/Tooltip/Basket.html.twig yes diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index a2bd002e0f..cb2cb96690 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1,14 +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 @@ -117,7 +117,7 @@ %basket_length% documents %basket_length% documents - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/index.html.twig web/lightbox/index.html.twig @@ -193,7 +193,7 @@ %nb_records% records %nb_records% enregistrement(s) prod/Tooltip/Story.html.twig - prod/Tooltip/Basket.html.twig + prod/Tooltip/Basket.html.twig %nb_view% vue @@ -1397,10 +1397,10 @@ Back Retour mobile/lightbox/basket_element.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/validate.html.twig Back to Feedback @@ -2302,7 +2302,7 @@ Deconnexion Déconnexion - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig Decouvrez la documentation @@ -2566,8 +2566,7 @@ Do you want to send your report ? Souhaitez-vous envoyer votre rapport ? Phrasea/Controller/LightboxController.php - mobile/lightbox/validate.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig Document @@ -3619,7 +3618,7 @@ Accueil mobile/lightbox/basket_element.html.twig mobile/lightbox/feed.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig login/include/language-block.html.twig login/layout/base-layout.html.twig @@ -4900,12 +4899,12 @@ Paniers Paniers - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/account/account.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Par %author% @@ -7335,11 +7334,11 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Validations Validations - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Validations received @@ -7410,13 +7409,13 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Voici vos paniers Paniers disponibles - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig Voici vos validations en cours Demandes de validations en cours - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig @@ -7980,8 +7979,8 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis a propos A propos - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig action : ajouter au panier @@ -8025,7 +8024,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig action : outils @@ -9434,7 +9433,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig boutton::tester @@ -10117,14 +10116,14 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le lightbox::list Vignette - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig lightbox::recaptitulatif Récapitulatif - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/agreement_box.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox::see_less_basket @@ -10136,47 +10135,47 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Voir plus de paniers web/lightbox/index.html.twig - + lightbox:feedback:sendreport:warnwindows:cancel Annuler l'envois et continuer la validation - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig - + lightbox:feedback:sendreport:warnwindows:message Récapitulatif des choix de la validation - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig - + lightbox:feedback:sendreport:warnwindows:record_approved Approuvés - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig - + lightbox:feedback:sendreport:warnwindows:record_rejected Refusés - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig - + lightbox:feedback:sendreport:warnwindows:record_unexpressed Non exprimé - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig - + lightbox:feedback:sendreport:warnwindows:title Résumé de la validation - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/validate.html.twig - + lightbox:feedback:sendreport:warnwindows:validate Confirmer l'envois du rapport - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig login:: Changer mon adresse email @@ -11062,31 +11061,37 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le phraseanet::temps:: a l'instant A l'instant lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: hier Hier lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% heures Il y a %quantity% heures lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% minutes Il y a %quantity% minutes lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une heure Il y a une heure lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une minute Il y a une minute lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::time:: a @@ -11725,12 +11730,17 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Supprimer la selection prod/actions/Push.html.twig + + prod:workzone:basket:creation-date + prod:workzone:basket:creation-date + prod/Tooltip/Basket.html.twig + prod:workzone:facetstab:search_and_facets_sort_options Options web/prod/index.html.twig - + prod:workzone:facetstab:tooltips:facet_and_filter Inclure les résultats web/prod/index.html.twig @@ -11740,7 +11750,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Exclure les résultats web/prod/index.html.twig - + prod:workzone:facetstab:tooltips:remove_facet_filter Supprimer le filtre web/prod/index.html.twig @@ -13368,8 +13378,8 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le validation::envoyer mon rapport Envoyer mon rapport - mobile/lightbox/validate.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/basket_options.html.twig web/lightbox/basket_options.html.twig @@ -13399,11 +13409,11 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Outils vidéos actions/Tools/videoEditor.html.twig - + workzone:feedback:expiration Validation ouverte jusqu'au prod/WorkZone/Basket.html.twig - prod/Tooltip/Basket.html.twig + prod/Tooltip/Basket.html.twig yes diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index 933082ae1a..63376e621f 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. @@ -121,7 +121,7 @@ %basket_length% documents %basket_length% documenten - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/index.html.twig web/lightbox/index.html.twig @@ -197,7 +197,7 @@ %nb_records% records %nb_records% records prod/Tooltip/Story.html.twig - prod/Tooltip/Basket.html.twig + prod/Tooltip/Basket.html.twig %nb_view% vue @@ -1402,10 +1402,10 @@ Back Terug mobile/lightbox/basket_element.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/validate.html.twig Back to Feedback @@ -2309,7 +2309,7 @@ Deconnexion Log out - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig Decouvrez la documentation @@ -2573,8 +2573,7 @@ Do you want to send your report ? Wenst u uw rapport te sturen ? Phrasea/Controller/LightboxController.php - mobile/lightbox/validate.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig Document @@ -3629,7 +3628,7 @@ Startpagina mobile/lightbox/basket_element.html.twig mobile/lightbox/feed.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig login/include/language-block.html.twig login/layout/base-layout.html.twig @@ -4910,12 +4909,12 @@ Paniers Mandjes - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/account/account.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Par %author% @@ -7343,11 +7342,11 @@ Validations Controles - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig Validations received @@ -7418,13 +7417,13 @@ Voici vos paniers Uw mandjes - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig Voici vos validations en cours Een controle in proces - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig web/lightbox/index.html.twig @@ -7988,8 +7987,8 @@ a propos Over - mobile/lightbox/index.html.twig - mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig + mobile/lightbox/index.html.twig action : ajouter au panier @@ -8033,7 +8032,7 @@ web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig action : outils @@ -9441,7 +9440,7 @@ web/lightbox/feed.html.twig lightbox/IE6/feed.html.twig lightbox/IE6/validate.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig boutton::tester @@ -10124,14 +10123,14 @@ lightbox::list lightbox::list - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig lightbox::recaptitulatif Beknopt - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/agreement_box.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox::see_less_basket @@ -10146,44 +10145,44 @@ lightbox:feedback:sendreport:warnwindows:cancel lightbox:feedback:sendreport:warnwindows:cancel - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:message lightbox:feedback:sendreport:warnwindows:message - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:record_approved lightbox:feedback:sendreport:warnwindows:record_approved - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:record_rejected lightbox:feedback:sendreport:warnwindows:record_rejected - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:record_unexpressed lightbox:feedback:sendreport:warnwindows:record_unexpressed - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:title lightbox:feedback:sendreport:warnwindows:title - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/validate.html.twig lightbox:feedback:sendreport:warnwindows:validate lightbox:feedback:sendreport:warnwindows:validate - mobile/lightbox/validate.html.twig - web/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + web/lightbox/validate.html.twig login:: Changer mon adresse email @@ -11069,31 +11068,37 @@ phraseanet::temps:: a l'instant op dit moment lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: hier gisteren lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% heures phraseanet::temps:: il y a %quantity% heures lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% minutes phraseanet::temps:: il y a %quantity% minutes lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une heure een uur geleden lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une minute één minuut geleden lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::time:: a @@ -11726,6 +11731,11 @@ prod:push: delete selection prod/actions/Push.html.twig + + prod:workzone:basket:creation-date + prod:workzone:basket:creation-date + prod/Tooltip/Basket.html.twig + prod:workzone:facetstab:search_and_facets_sort_options prod:workzone:facetstab:search_and_facets_sort_options @@ -13369,8 +13379,8 @@ validation::envoyer mon rapport stuur mijn rapport - mobile/lightbox/validate.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/basket_options.html.twig web/lightbox/basket_options.html.twig @@ -13404,7 +13414,7 @@ workzone:feedback:expiration workzone:feedback:expiration prod/WorkZone/Basket.html.twig - prod/Tooltip/Basket.html.twig + prod/Tooltip/Basket.html.twig yes diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index 33596e5930..4070c8f51a 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 c0a4fb87ee..8d7f9e6487 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 2dc9b0935b..30dd5d546a 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 722071bff5..515d9f7788 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. From 947bc734acf74df43ec81c7c8d0aa97884d47047 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 13 Mar 2020 17:14:37 +0400 Subject: [PATCH 3/6] PHRAS-2978 #comment fix date format and add datepicker fo modify feedback validation deadline #time 4h --- lib/classes/phraseadate.php | 56 +------ resources/locales/messages.de.xlf | 168 ++++++++++++++++--- resources/locales/messages.en.xlf | 168 ++++++++++++++++--- resources/locales/messages.fr.xlf | 168 ++++++++++++++++--- resources/locales/messages.nl.xlf | 168 ++++++++++++++++--- resources/locales/validators.de.xlf | 2 +- resources/locales/validators.en.xlf | 2 +- resources/locales/validators.fr.xlf | 2 +- resources/locales/validators.nl.xlf | 2 +- templates/web/prod/Tooltip/Basket.html.twig | 4 +- templates/web/prod/WorkZone/Basket.html.twig | 42 ++++- 11 files changed, 611 insertions(+), 171 deletions(-) diff --git a/lib/classes/phraseadate.php b/lib/classes/phraseadate.php index 7d71c3445a..6acca8b75f 100644 --- a/lib/classes/phraseadate.php +++ b/lib/classes/phraseadate.php @@ -90,13 +90,14 @@ class phraseadate $compareTo = new DateTime('now'); $diff = $compareTo->format('U') - $date->format('U'); + $yearDiff = $compareTo->format('Y') - $date->format('Y'); $dayDiff = floor($diff / 86400); if (is_nan($dayDiff) || $dayDiff > 365000) { return ''; } - $date_string = $this->formatDate($date, $this->app['locale'], 'DAY_MONTH'); + $date_string = $this->formatDate($date, $this->app['locale'], ($yearDiff != 0) ? 'DAY_MONTH_YEAR' : 'DAY_MONTH'); if ($dayDiff == 0) { if ($diff < 60) { @@ -119,59 +120,6 @@ class phraseadate } } - /** - * - * @param DateTime $date - * @return string - */ - public function getLocalDate(DateTime $date = null) - { - if (is_null($date)) { - return null; - } - - $compareTo = new DateTime('now'); - $diff = $compareTo->format('U') - $date->format('U'); - $currentYear = $date->format('Y'); - $dayDiff = floor($diff / 86400); - - if (is_nan($dayDiff) || $dayDiff > 365000) { - return ''; - } - - - - $date_string_Y = new IntlDateFormatter($this->app['locale'], NULL, NULL, NULL, NULL, 'dd MMMM yyyy'); - // $date_string_M = new IntlDateFormatter($this->app['locale'], NULL, NULL, NULL, NULL, 'dd MMMM'); - - if ($dayDiff == 0) { - if ($diff < 60) { - return $this->app->trans('phraseanet::temps:: a l\'instant'); - } elseif ($diff < 120) { - return $this->app->trans('phraseanet::temps:: il y a une minute'); - } elseif ($diff < 3600) { - return $this->app->trans('phraseanet::temps:: il y a %quantity% minutes', ['%quantity%' => floor($diff / 60)]); - } elseif ($diff < 7200) { - return $this->app->trans('phraseanet::temps:: il y a une heure'); - } elseif ($diff < 86400) { - return $this->app->trans('phraseanet::temps:: il y a %quantity% heures', ['%quantity%' => floor($diff / 3600)]); - } - } elseif ($dayDiff == 1) { - return $this->app->trans('phraseanet::temps:: hier'); - - }else { - // current year - /* if (date('Y')== $currentYear) { - return $date_string_M->format($date); - }*/ - //return $date_string_Y->format($date); - } - - - - return $date_string_Y->format($date); - } - /** * * @param DateTime $date diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index e098ee4b2f..9ca23ed2d7 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. @@ -1689,7 +1689,7 @@ Certaines donnees du panier ont change Einige Daten des Sammelkorbs wurden verändert - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig Certaines donnees du reportage ont change @@ -3213,7 +3213,7 @@ Controller/Prod/LanguageController.php prod/WorkZone/Story.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig @@ -7997,14 +7997,14 @@ action : collection Verschieben prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : editer Bearbeiten prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/preview/caption.html.twig @@ -8012,7 +8012,7 @@ action : exporter Exportieren prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/results/record.html.twig prod/results/record.html.twig @@ -8028,14 +8028,14 @@ action : outils Werkzeuge prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : print Drucken prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/results/record.html.twig prod/results/record.html.twig @@ -8046,7 +8046,7 @@ action : publier Veröffentlichen prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig web/prod/index.html.twig @@ -8054,14 +8054,14 @@ action : push Push prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : status Eigenschaften prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig @@ -9137,13 +9137,13 @@ basket:action:delete record form basket basket:action:delete record form basket prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig basket:action:delete record form database basket:action:delete record form database prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig be notified when a document is placed in quarantine @@ -11057,38 +11057,32 @@ phraseanet::temps:: a l'instant gerade - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: hier gestern - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% heures vor %quantity% Stunde - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% minutes vor %quantity% Minuten - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une heure vor einer Stunde - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une minute vor einer Minute - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::time:: a @@ -11832,7 +11826,7 @@ Aktualisieren prod/WorkZone/Story.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig prod/results/feeds.html.twig prod/results/feeds.html.twig @@ -13400,12 +13394,132 @@ Video Werkzeug actions/Tools/videoEditor.html.twig + + workzone:datepicker:april + workzone:datepicker:april + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:august + workzone:datepicker:august + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:closeText + workzone:datepicker:closeText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:currentText + workzone:datepicker:currentText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:december + workzone:datepicker:december + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:february + workzone:datepicker:february + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:friday + workzone:datepicker:friday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:january + workzone:datepicker:january + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:july + workzone:datepicker:july + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:june + workzone:datepicker:june + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:march + workzone:datepicker:march + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:may + workzone:datepicker:may + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:monday + workzone:datepicker:monday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:nextText + workzone:datepicker:nextText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:november + workzone:datepicker:november + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:october + workzone:datepicker:october + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:prevText + workzone:datepicker:prevText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:saturday + workzone:datepicker:saturday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:september + workzone:datepicker:september + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:sunday + workzone:datepicker:sunday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:thursday + workzone:datepicker:thursday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:tuesday + workzone:datepicker:tuesday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:wednesday + workzone:datepicker:wednesday + prod/WorkZone/Basket.html.twig + workzone:feedback:expiration workzone:feedback:expiration - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig prod/Tooltip/Basket.html.twig + + workzone:feedback:update + workzone:feedback:update + prod/WorkZone/Basket.html.twig + yes Ja diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 4b88c83382..95c032bf88 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.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. @@ -1690,7 +1690,7 @@ Certaines donnees du panier ont change This basket has been updated - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig Certaines donnees du reportage ont change @@ -3216,7 +3216,7 @@ Controller/Prod/LanguageController.php prod/WorkZone/Story.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig @@ -8000,14 +8000,14 @@ action : collection Move prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : editer Edit prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/preview/caption.html.twig @@ -8015,7 +8015,7 @@ action : exporter Export prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/results/record.html.twig prod/results/record.html.twig @@ -8031,14 +8031,14 @@ action : outils Tools prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : print Print prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/results/record.html.twig prod/results/record.html.twig @@ -8049,7 +8049,7 @@ action : publier Publish prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig web/prod/index.html.twig @@ -8057,14 +8057,14 @@ action : push Push prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : status Properties prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig @@ -9140,13 +9140,13 @@ basket:action:delete record form basket Delete record from basket prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig basket:action:delete record form database Delete record from database prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig be notified when a document is placed in quarantine @@ -11060,38 +11060,32 @@ phraseanet::temps:: a l'instant Just now - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: hier Yesterday - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% heures %quantity% hours ago - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% minutes %quantity% minutes ago - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une heure One hour ago - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une minute One minute ago - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::time:: a @@ -11838,7 +11832,7 @@ It is possible to place several search areas Refresh prod/WorkZone/Story.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig prod/results/feeds.html.twig prod/results/feeds.html.twig @@ -13406,12 +13400,132 @@ It is possible to place several search areas Thumbnail Tools actions/Tools/videoEditor.html.twig + + workzone:datepicker:april + workzone:datepicker:april + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:august + workzone:datepicker:august + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:closeText + workzone:datepicker:closeText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:currentText + workzone:datepicker:currentText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:december + workzone:datepicker:december + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:february + workzone:datepicker:february + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:friday + workzone:datepicker:friday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:january + workzone:datepicker:january + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:july + workzone:datepicker:july + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:june + workzone:datepicker:june + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:march + workzone:datepicker:march + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:may + workzone:datepicker:may + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:monday + workzone:datepicker:monday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:nextText + workzone:datepicker:nextText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:november + workzone:datepicker:november + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:october + workzone:datepicker:october + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:prevText + workzone:datepicker:prevText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:saturday + workzone:datepicker:saturday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:september + workzone:datepicker:september + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:sunday + workzone:datepicker:sunday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:thursday + workzone:datepicker:thursday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:tuesday + workzone:datepicker:tuesday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:wednesday + workzone:datepicker:wednesday + prod/WorkZone/Basket.html.twig + workzone:feedback:expiration Feedback open Until - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig prod/Tooltip/Basket.html.twig + + workzone:feedback:update + workzone:feedback:update + prod/WorkZone/Basket.html.twig + yes Yes diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index cb2cb96690..1b43accabe 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. @@ -1689,7 +1689,7 @@ Certaines donnees du panier ont change Certaines données du panier ont changé - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig Certaines donnees du reportage ont change @@ -3213,7 +3213,7 @@ Controller/Prod/LanguageController.php prod/WorkZone/Story.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig @@ -7999,14 +7999,14 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis action : collection Déplacer prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : editer Editer prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/preview/caption.html.twig @@ -8014,7 +8014,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis action : exporter Exporter prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/results/record.html.twig prod/results/record.html.twig @@ -8030,14 +8030,14 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis action : outils Outils prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : print Imprimer prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/results/record.html.twig prod/results/record.html.twig @@ -8048,7 +8048,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis action : publier Publier prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig web/prod/index.html.twig @@ -8056,14 +8056,14 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis action : push Push prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : status Propriétés prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig @@ -9140,13 +9140,13 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le basket:action:delete record form basket Retirer du panier prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig basket:action:delete record form database Supprimer l'enregistrement de la base prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig be notified when a document is placed in quarantine @@ -11060,38 +11060,32 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le phraseanet::temps:: a l'instant A l'instant - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: hier Hier - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% heures Il y a %quantity% heures - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% minutes Il y a %quantity% minutes - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une heure Il y a une heure - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une minute Il y a une minute - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::time:: a @@ -11841,7 +11835,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Rafraîchir prod/WorkZone/Story.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig prod/results/feeds.html.twig prod/results/feeds.html.twig @@ -13409,12 +13403,132 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Outils vidéos actions/Tools/videoEditor.html.twig + + workzone:datepicker:april + workzone:datepicker:april + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:august + workzone:datepicker:august + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:closeText + workzone:datepicker:closeText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:currentText + workzone:datepicker:currentText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:december + workzone:datepicker:december + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:february + workzone:datepicker:february + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:friday + workzone:datepicker:friday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:january + workzone:datepicker:january + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:july + workzone:datepicker:july + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:june + workzone:datepicker:june + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:march + workzone:datepicker:march + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:may + workzone:datepicker:may + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:monday + workzone:datepicker:monday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:nextText + workzone:datepicker:nextText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:november + workzone:datepicker:november + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:october + workzone:datepicker:october + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:prevText + workzone:datepicker:prevText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:saturday + workzone:datepicker:saturday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:september + workzone:datepicker:september + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:sunday + workzone:datepicker:sunday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:thursday + workzone:datepicker:thursday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:tuesday + workzone:datepicker:tuesday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:wednesday + workzone:datepicker:wednesday + prod/WorkZone/Basket.html.twig + workzone:feedback:expiration Validation ouverte jusqu'au - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig prod/Tooltip/Basket.html.twig + + workzone:feedback:update + workzone:feedback:update + prod/WorkZone/Basket.html.twig + yes Oui diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index 63376e621f..c61524de6a 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. @@ -1694,7 +1694,7 @@ Certaines donnees du panier ont change Sommige gegevens in het mandje zijn veranderd - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig Certaines donnees du reportage ont change @@ -3223,7 +3223,7 @@ Controller/Prod/LanguageController.php prod/WorkZone/Story.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig @@ -8007,14 +8007,14 @@ action : collection Collectie prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : editer Wijzigen prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/preview/caption.html.twig @@ -8022,7 +8022,7 @@ action : exporter Exporteer prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/results/record.html.twig prod/results/record.html.twig @@ -8038,14 +8038,14 @@ action : outils Gereedschappen prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : print Print prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig prod/results/record.html.twig prod/results/record.html.twig @@ -8056,7 +8056,7 @@ action : publier Publiceren prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig web/prod/index.html.twig @@ -8064,14 +8064,14 @@ action : push Push prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig action : status Status prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig web/prod/toolbar.html.twig @@ -9147,13 +9147,13 @@ basket:action:delete record form basket basket:action:delete record form basket prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig basket:action:delete record form database basket:action:delete record form database prod/WorkZone/Story.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig be notified when a document is placed in quarantine @@ -11067,38 +11067,32 @@ phraseanet::temps:: a l'instant op dit moment - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: hier gisteren - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% heures phraseanet::temps:: il y a %quantity% heures - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a %quantity% minutes phraseanet::temps:: il y a %quantity% minutes - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une heure een uur geleden - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::temps:: il y a une minute één minuut geleden - lib/classes/phraseadate.php - lib/classes/phraseadate.php + lib/classes/phraseadate.php phraseanet::time:: a @@ -11842,7 +11836,7 @@ vernieuwen prod/WorkZone/Story.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig prod/results/feeds.html.twig prod/results/feeds.html.twig @@ -13410,12 +13404,132 @@ video tool actions/Tools/videoEditor.html.twig + + workzone:datepicker:april + workzone:datepicker:april + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:august + workzone:datepicker:august + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:closeText + workzone:datepicker:closeText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:currentText + workzone:datepicker:currentText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:december + workzone:datepicker:december + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:february + workzone:datepicker:february + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:friday + workzone:datepicker:friday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:january + workzone:datepicker:january + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:july + workzone:datepicker:july + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:june + workzone:datepicker:june + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:march + workzone:datepicker:march + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:may + workzone:datepicker:may + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:monday + workzone:datepicker:monday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:nextText + workzone:datepicker:nextText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:november + workzone:datepicker:november + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:october + workzone:datepicker:october + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:prevText + workzone:datepicker:prevText + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:saturday + workzone:datepicker:saturday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:september + workzone:datepicker:september + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:sunday + workzone:datepicker:sunday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:thursday + workzone:datepicker:thursday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:tuesday + workzone:datepicker:tuesday + prod/WorkZone/Basket.html.twig + + + workzone:datepicker:wednesday + workzone:datepicker:wednesday + prod/WorkZone/Basket.html.twig + workzone:feedback:expiration workzone:feedback:expiration - prod/WorkZone/Basket.html.twig + prod/WorkZone/Basket.html.twig prod/Tooltip/Basket.html.twig + + workzone:feedback:update + workzone:feedback:update + prod/WorkZone/Basket.html.twig + yes Ja diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index 4070c8f51a..b7398ca514 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 8d7f9e6487..f8d0a54e1d 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 30dd5d546a..6f350ddd76 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 515d9f7788..2218c1ff00 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/templates/web/prod/Tooltip/Basket.html.twig b/templates/web/prod/Tooltip/Basket.html.twig index f35dfa0091..9905cbf49c 100644 --- a/templates/web/prod/Tooltip/Basket.html.twig +++ b/templates/web/prod/Tooltip/Basket.html.twig @@ -10,7 +10,7 @@
{% if basket.getValidation() %} - {% set dateExpired = app['date-formatter'].getLocalDate(basket.getValidation().getExpires()) %} + {% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %} {{ 'workzone:feedback:expiration' | trans }} : {{ dateExpired }} {% endif %} @@ -19,7 +19,7 @@
{% set nb_records = basket.getElements()|length %} - {% set date = app['date-formatter'].getLocalDate(basket.getUpdated()) %} + {% set date = app['date-formatter'].getPrettyString(basket.getUpdated()) %}
{% trans with {'%nb_records%' : nb_records} %}%nb_records% records{% endtrans %} diff --git a/templates/web/prod/WorkZone/Basket.html.twig b/templates/web/prod/WorkZone/Basket.html.twig index 68613370ef..ef0f52f980 100644 --- a/templates/web/prod/WorkZone/Basket.html.twig +++ b/templates/web/prod/WorkZone/Basket.html.twig @@ -1,3 +1,4 @@ +
@@ -89,9 +90,17 @@ {% endif %}
{% if basket.getValidation() %} - {% set dateExpired = app['date-formatter'].getLocalDate(basket.getValidation().getExpires()) %} - - {{ 'workzone:feedback:expiration' | trans }} : {{ dateExpired }} + {% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %} +
+ {{ 'workzone:feedback:expiration' | trans }} : +
+ + + + +
+
+ {% endif %}
{% set basket_length = basket.getElements()|length %} @@ -113,4 +122,31 @@
+ + + From 56f6eb83e3d52a654287d4214045c31f016026b7 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 16 Mar 2020 15:46:41 +0400 Subject: [PATCH 4/6] PHRAS-2978-add feedback creation date on workzone feedback --- package.json | 2 +- templates/web/prod/WorkZone/Basket.html.twig | 32 +++++++++++++------- yarn.lock | 8 ++--- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 70d1fbaddb..7ce6d01a66 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.149-d", + "phraseanet-production-client": "0.34.150-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/templates/web/prod/WorkZone/Basket.html.twig b/templates/web/prod/WorkZone/Basket.html.twig index ef0f52f980..fb028812d5 100644 --- a/templates/web/prod/WorkZone/Basket.html.twig +++ b/templates/web/prod/WorkZone/Basket.html.twig @@ -90,18 +90,28 @@ {% endif %}
{% if basket.getValidation() %} - {% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %} -
- {{ 'workzone:feedback:expiration' | trans }} : -
- - - - -
-
+
{% set basket_length = basket.getElements()|length %}
{{ 'Certaines donnees du panier ont change' | trans }} {{ 'rafraichir' | trans }}
diff --git a/yarn.lock b/yarn.lock index 98775d43a0..4af2ac395c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.149-d: - version "0.34.149-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.149-d.tgz#e486bbe160861d259b005c7b549d8f1ea08cd82d" - integrity sha512-7aXn1WWcALhuruiz8dkLS67Z6MNkQZoxoehCE7iRdnIDRzKioYQ1wycia4MtxyL+4S5XZZb39HIunvdxGsgDSQ== +phraseanet-production-client@0.34.150-d: + version "0.34.150-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.150-d.tgz#625ea96c045719b405fe9b707b632b1290aca285" + integrity sha512-JrtPq6dCTCBxX6kGViXZj4Sc26PMFIaifT3PVD1WHLUCNd/U3nnHzpzKUgVC0ibqOj4aVwA8JW/oMilGEe3cmg== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From 7e3b480442aea13ee718782bbf8245e50a221468 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 16 Mar 2020 16:51:02 +0400 Subject: [PATCH 5/6] PHRAS-2978 fix icon preview --- package.json | 2 +- templates/web/prod/preview/appears_in.html.twig | 8 ++++---- yarn.lock | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 7ce6d01a66..b9d1375021 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.150-d", + "phraseanet-production-client": "0.34.151-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/templates/web/prod/preview/appears_in.html.twig b/templates/web/prod/preview/appears_in.html.twig index e6087d49ab..0b7aa4dfa5 100644 --- a/templates/web/prod/preview/appears_in.html.twig +++ b/templates/web/prod/preview/appears_in.html.twig @@ -27,15 +27,15 @@ {##} {% if basket.getValidation() %} - + {% elseif basket.getPusher() %} {% if not basket.isRead() %} - + {% else %} - + {% endif %} {% else %} - + {% endif %} {{basket.getName()}} diff --git a/yarn.lock b/yarn.lock index 4af2ac395c..f6889a2d62 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.150-d: - version "0.34.150-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.150-d.tgz#625ea96c045719b405fe9b707b632b1290aca285" - integrity sha512-JrtPq6dCTCBxX6kGViXZj4Sc26PMFIaifT3PVD1WHLUCNd/U3nnHzpzKUgVC0ibqOj4aVwA8JW/oMilGEe3cmg== +phraseanet-production-client@0.34.151-d: + version "0.34.151-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.151-d.tgz#e004c9990160959028a2fe581b0108074c0b06f4" + integrity sha512-4KcbDpWSqOqIhtUHrZKV/qiAZlcW81d8u7ZuTSJ7Eyq6ft0os1IJZ2ccJ0WZIgbcRU5JCfY6Y1bVvajqfOT9sA== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From 9c87ba5504e588ea80ed6eaf8358133586159037 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 16 Mar 2020 17:40:32 +0400 Subject: [PATCH 6/6] PHRAS-2978 remove other change for PHRAS-2989 --- package.json | 2 +- templates/web/prod/preview/appears_in.html.twig | 8 ++++---- yarn.lock | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index b9d1375021..7ce6d01a66 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.151-d", + "phraseanet-production-client": "0.34.150-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/templates/web/prod/preview/appears_in.html.twig b/templates/web/prod/preview/appears_in.html.twig index 0b7aa4dfa5..e6087d49ab 100644 --- a/templates/web/prod/preview/appears_in.html.twig +++ b/templates/web/prod/preview/appears_in.html.twig @@ -27,15 +27,15 @@ {##} {% if basket.getValidation() %} - + {% elseif basket.getPusher() %} {% if not basket.isRead() %} - + {% else %} - + {% endif %} {% else %} - + {% endif %} {{basket.getName()}} diff --git a/yarn.lock b/yarn.lock index f6889a2d62..4af2ac395c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.151-d: - version "0.34.151-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.151-d.tgz#e004c9990160959028a2fe581b0108074c0b06f4" - integrity sha512-4KcbDpWSqOqIhtUHrZKV/qiAZlcW81d8u7ZuTSJ7Eyq6ft0os1IJZ2ccJ0WZIgbcRU5JCfY6Y1bVvajqfOT9sA== +phraseanet-production-client@0.34.150-d: + version "0.34.150-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.150-d.tgz#625ea96c045719b405fe9b707b632b1290aca285" + integrity sha512-JrtPq6dCTCBxX6kGViXZj4Sc26PMFIaifT3PVD1WHLUCNd/U3nnHzpzKUgVC0ibqOj4aVwA8JW/oMilGEe3cmg== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6"