hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 15:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-3014 #comment fix Prod editing confirm before filling latitude and longitude #time 8h

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-04-08 11:15:29 +04:00
parent 2b97e96b33
commit 4ab5d7f6ee
5 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -65,7 +65,7 @@
"normalize-css": "^2.1.0",
"npm": "^6.0.0",
"npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.168-d",
"phraseanet-production-client": "0.34.169-d",
"requirejs": "^2.3.5",
"tinymce": "^4.0.28",
"underscore": "^1.8.3",

31
resources/locales/messages.de.xlf
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2020-04-03T07:42:51Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<file date="2020-04-08T07:11:34Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>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.</note>
@@ -11405,11 +11405,36 @@
<target state="translated">Möchten Sie auch die Dokumente, die mit diesen Berichten verknüpft sind, verschieben?</target>
<jms:reference-file line="34">prod/actions/collection_default.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="64c5b2559a8a7877b0218fd056b3bc89d48a0937" resname="prod::edit: Confirmation Edition latitude longitude">
<source>prod::edit: Confirmation Edition latitude longitude</source>
<target state="new">prod::edit: Confirmation Edition latitude longitude</target>
<jms:reference-file line="414">prod/actions/edit_default.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="063431f63e0c593c52fffb55f390d1d9c216ee4a" resname="prod::edit: Impossible d'editer simultanement des documents provenant de bases differentes" approved="yes">
<source>prod::edit: Impossible d'editer simultanement des documents provenant de bases differentes</source>
<target state="translated">Es ist nicht möglich, Dokumente die aus verschiedenen Bilddatenbanken stammen gleichzeitig zu bearbeiten</target>
<jms:reference-file line="406">prod/actions/edit_default.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="738435876403484874051abcbc8b9bbeef7be5e9" resname="prod::edit:confirm: Cancel">
<source>prod::edit:confirm: Cancel</source>
<target state="new">prod::edit:confirm: Cancel</target>
<jms:reference-file line="418">prod/actions/edit_default.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="c3411dbdb5fa1963791b5e8d97b6f2c9532dded8" resname="prod::edit:confirm: Edition latitude longitude">
<source>prod::edit:confirm: Edition latitude longitude</source>
<target state="new">prod::edit:confirm: Edition latitude longitude</target>
<jms:reference-file line="413">prod/actions/edit_default.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="e625a89e837b1b0b9450fb89ddc4f29b570df7ab" resname="prod::edit:confirm: No">
<source>prod::edit:confirm: No</source>
<target state="new">prod::edit:confirm: No</target>
<jms:reference-file line="417">prod/actions/edit_default.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="683af4416e59f0bfc4663f1627063c50c9205df1" resname="prod::edit:confirm: Yes">
<source>prod::edit:confirm: Yes</source>
<target state="new">prod::edit:confirm: Yes</target>
<jms:reference-file line="416">prod/actions/edit_default.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="c1978319cea9a232bb3076453e217df0781ef7a6" resname="prod::editing valeurs heterogenes, choisir 'remplacer', 'ajouter' ou 'annuler'" approved="yes">
<source>prod::editing valeurs heterogenes, choisir 'remplacer', 'ajouter' ou 'annuler'</source>
<target state="translated">Heterogene Werte, bitte wählen Sie "ersetzen", "hinzufügen" oder "abbrechen"</target>
@@ -11418,12 +11443,12 @@
<trans-unit id="b4647a860e97f9b173747e8736ae36630631fbb4" resname="prod::editing: %not_actionable% documents ne peuvent etre edites car vos droits sont induffisants" approved="yes">
<source>prod::editing: %not_actionable% documents ne peuvent etre edites car vos droits sont induffisants</source>
<target state="translated">%not_actionable% Dokumente können nicht bearbeitet werden, da Sie keine Rechte darauf haben</target>
<jms:reference-file line="435">prod/actions/edit_default.html.twig</jms:reference-file>
<jms:reference-file line="442">prod/actions/edit_default.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="e58fe53260dcb47548d687b0aac89a231f8fd349" resname="prod::editing: 1 document ne peut etre edite car vos droits sont induffisants" approved="yes">
<source>prod::editing: 1 document ne peut etre edite car vos droits sont induffisants</source>
<target state="translated">Keine Bearbeitung möglich. Sie haben keinen Zugriff auf die Dokumente</target>
<jms:reference-file line="437">prod/actions/edit_default.html.twig</jms:reference-file>
<jms:reference-file line="444">prod/actions/edit_default.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="d06429358cfa7814d995cffec515505b4babbdf3" resname="prod::editing: aucun documents ne peuvent etre edites car vos droits sont induffisants" approved="yes">
<source>prod::editing: aucun documents ne peuvent etre edites car vos droits sont induffisants</source>

2
resources/locales/validators.de.xlf
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2020-04-03T07:42:51Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<file date="2020-04-08T07:11:34Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>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.</note>

7
templates/web/prod/actions/edit_default.html.twig
View File

@@ -410,6 +410,13 @@
</p>
</div>
<div id="dialog-edit_lat_lon" title=" {{ 'prod::edit:confirm: Edition latitude longitude' | trans }}">
<p><span class="ui-icon ui-icon-alert" style="float:left; margin:12px 12px 20px 0;"></span>{{ 'prod::edit: Confirmation Edition latitude longitude' | trans }}</p>
</div>
<input type="hidden" id="dialog-edit-yes" value="{{ 'prod::edit:confirm: Yes' | trans }}" />
<input type="hidden" id="dialog-edit-no" value="{{ 'prod::edit:confirm: No' | trans }}" />
<input type="hidden" id="dialog-edit-cancel" value="{{ 'prod::edit:confirm: Cancel' | trans }}" />
<script type="text/javascript">
{% if multipleDataboxes == 1 %}
$(function() {

8
yarn.lock
View File

@@ -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.168-d:
version "0.34.168-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.168-d.tgz#97adb25a7be0de428b3bcd94650315c84d8d3a20"
integrity sha512-hYkPwqESGbzr2/YG7IZcFfIhom8x5kO1nniEXHonz+KRK4SaYWvJ9bD67ePc8G9VO0EenkRoZX1rRcn5dWLa9w==
phraseanet-production-client@0.34.169-d:
version "0.34.169-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.169-d.tgz#5313b1965ac1d4bd5127072de4eb9328534d1da6"
integrity sha512-StX/FyOGaM4yb8DAs2v0G8+ZqJawT3T1bQbpy8ufmMlqen/tdVcjjAPNBDpz9sAQK+PYVIYHHQnWuywwVUMANg==
dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6"