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

Merge pull request #2471 from mike-esokia/PHRAS-1854_PORT_PHRAS-1319

Browse Source 
PHRAS-1854 port PHRAS-1319
This commit is contained in:
Nicolas Maillat
2018-02-15 12:09:50 +01:00
committed by GitHub
parent 090c9196d6 e28006f6a6
commit 696da67286
11 changed files with 2187 additions and 6914 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5851
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

766
resources/locales/messages.en.xlf
View File

File diff suppressed because it is too large Load Diff

766
resources/locales/messages.fr.xlf
View File

File diff suppressed because it is too large Load Diff

766
resources/locales/messages.nl.xlf
View File

File diff suppressed because it is too large Load Diff

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

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?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"> <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2018-01-09T05:47:20Z" source-language="en" target-language="de" datatype="plaintext" original="not.available"> <file date="2018-02-12T07:27:14Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<header> <header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/> <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> <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>

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

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?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"> <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2018-01-09T05:47:59Z" source-language="en" target-language="en" datatype="plaintext" original="not.available"> <file date="2018-02-12T07:27:57Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
<header> <header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/> <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> <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>

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

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?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"> <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2018-01-09T05:48:46Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available"> <file date="2018-02-12T07:28:51Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
<header> <header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/> <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> <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>

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

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?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"> <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2018-01-09T05:49:38Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available"> <file date="2018-02-12T07:29:44Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
<header> <header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/> <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> <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>

133
templates/web/prod/results/help.html.twig
View File

@@ -5,69 +5,88 @@
<div>{{ results.warning }}</div> <div>{{ results.warning }}</div>
{% endif %} {% endif %}
<p> {#<p>#}
{{ 'Votre recherche ne retourne aucun resultat' | trans }} {#{{ 'Votre recherche ne retourne aucun resultat' | trans }}#}
</p> {#</p>#}
<div class="client_help"> <div class="client_help">
<h5>{{ 'La recherche s\'effectue grâce à la boîte de dialogue qui se trouve en haut à gauche de l\'écran.' | trans }} <div class="help-section">
{{ 'Sachez que vous pouvez utiliser les opérateurs ou caractères spéciaux suivants :' | trans }}</h5> <h4>{{ 'help::help-section-title: sorry-no-result' | trans }}</h4>
<h5 style="border:#CCCCCC 2px solid">{{ '* , ? , ET , OU , SAUF , DANS , DERNIERS , TOUT (ou AND , OR , EXCEPT , LAST , ALL)' | trans }}</h5> <ul>
<li><p>{{ 'help::help-section-bullet: check-spelling' | trans }}</p></li>
<li><p>{{ 'help::help-section-bullet: search-in-document' | trans }}</p></li>
<li><p>{{ 'help::help-section-bullet: remove-advance-search' | trans }}</p></li>
<li><p>{{ 'help::help-section-bullet: expand search' | trans }}</p></li>
</ul>
</div>
<div class="help-section">
<h4>{{ 'help::help-section-title: search-tips' | trans }}</h4>
<ul>
<li><p>{{ 'help::help-section-bullet: default-operator-between-terms' | trans }}</p></li>
<li><p>{{ 'help::help-section-bullet: use-OR-between-terms' | trans }}</p></li>
<li><p>{{ 'help::help-section-bullet: use-EXCEPT-operator' | trans }}</p></li>
<li><p>{{ 'help::help-section-bullet: quotation-marks-allow' | trans }}</p></li>
<li><p>{{ 'help::help-section-bullet: search-in-a-specific-field' | trans }}</p></li>
</ul>
</div>
{#<h5>{{ 'La recherche s\'effectue grâce à la boîte de dialogue qui se trouve en haut à gauche de l\'écran.' | trans }}#}
{#{{ 'Sachez que vous pouvez utiliser les opérateurs ou caractères spéciaux suivants :' | trans }}</h5>#}
{#<h5 style="border:#CCCCCC 2px solid">{{ '* , ? , ET , OU , SAUF , DANS , DERNIERS , TOUT (ou AND , OR , EXCEPT , LAST , ALL)' | trans }}</h5>#}
<h5>{{ 'Caractères de troncature' | trans }}</h5> {#<h5>{{ 'Caractères de troncature' | trans }}</h5>#}
<table> {#<table>#}
<tr> {#<tr>#}
<td valign="top"><kbd class="ky">{{ 'auto*' | trans }}</kbd></td> {#<td valign="top"><kbd class="ky">{{ 'auto*' | trans }}</kbd></td>#}
<td valign="top"> {{ 'retourne "automobile", "automate", "autoroute", ...' | trans }}</td> {#<td valign="top"> {{ 'retourne "automobile", "automate", "autoroute", ...' | trans }}</td>#}
</tr> {#</tr>#}
<tr> {#<tr>#}
<td valign="top"><kbd class="ky">{{ 'dé?it' | trans }}</kbd></td> {#<td valign="top"><kbd class="ky">{{ 'dé?it' | trans }}</kbd></td>#}
<td valign="top"> {{ 'retourne "délit", "débit", ...' | trans }}</td> {#<td valign="top"> {{ 'retourne "délit", "débit", ...' | trans }}</td>#}
</tr> {#</tr>#}
</table> {#</table>#}
<h5>{{ 'Visualiser tous les enregistrements / les derniers enregistrements' | trans }}</h5> {#<h5>{{ 'Visualiser tous les enregistrements / les derniers enregistrements' | trans }}</h5>#}
<table> {#<table>#}
<tr> {#<tr>#}
<td valign="top"><kbd class="ky"><b>{{ 'TOUT' | trans }}</b></kbd></td> {#<td valign="top"><kbd class="ky"><b>{{ 'TOUT' | trans }}</b></kbd></td>#}
<td valign="top">{{ 'retourne tous les enregistrements des collections selectionnees' | trans }}</td> {#<td valign="top">{{ 'retourne tous les enregistrements des collections selectionnees' | trans }}</td>#}
</tr> {#</tr>#}
<tr> {#<tr>#}
<td valign="top"><kbd class="ky"><b>{{ 'LAST 20' | trans }}</b></kbd></td> {#<td valign="top"><kbd class="ky"><b>{{ 'LAST 20' | trans }}</b></kbd></td>#}
<td valign="top">{{ 'retourne les 20 derniers enregistrements archives dans les collections selectionnees' | trans }}</td> {#<td valign="top">{{ 'retourne les 20 derniers enregistrements archives dans les collections selectionnees' | trans }}</td>#}
</tr> {#</tr>#}
</table> {#</table>#}
<h5>{{ 'Recherche multicritères' | trans }}</h5> {#<h5>{{ 'Recherche multicritères' | trans }}</h5>#}
{{ 'Vous pouvez affiner votre recherche avec les opérateurs : ET, OU, SAUF ou DANS' | trans }}<br> {#{{ 'Vous pouvez affiner votre recherche avec les opérateurs : ET, OU, SAUF ou DANS' | trans }}<br>#}
<table> {#<table>#}
<tr> {#<tr>#}
<td valign="top"><kbd class="ky">{{ 'sport' | trans }} <b>ET</b> {{ 'automobile' | trans }}</kbd></td> {#<td valign="top"><kbd class="ky">{{ 'sport' | trans }} <b>ET</b> {{ 'automobile' | trans }}</kbd></td>#}
<td valign="top">{{ 'retourne les documents comprenant les deux mots.' | trans }}</td> {#<td valign="top">{{ 'retourne les documents comprenant les deux mots.' | trans }}</td>#}
</tr> {#</tr>#}
<tr> {#<tr>#}
<td valign="top"><kbd class="ky">{{ 'journal OU jt' | trans }}</kbd></td> {#<td valign="top"><kbd class="ky">{{ 'journal OU jt' | trans }}</kbd></td>#}
<td valign="top">{{ 'retourne les documents comprenant un mot et/ou l\'autre.' | trans }}</td> {#<td valign="top">{{ 'retourne les documents comprenant un mot et/ou l\'autre.' | trans }}</td>#}
</tr> {#</tr>#}
<tr> {#<tr>#}
<td valign="top"><kbd class="ky">{{ 'cannes SAUF festival' | trans }}</kbd></td> {#<td valign="top"><kbd class="ky">{{ 'cannes SAUF festival' | trans }}</kbd></td>#}
<td valign="top">{{ 'retourne les documents comprenant cannes sans le mot festival.' | trans }}</td> {#<td valign="top">{{ 'retourne les documents comprenant cannes sans le mot festival.' | trans }}</td>#}
</tr> {#</tr>#}
<tr> {#<tr>#}
<td valign="top"><kbd class="ky">{{ 'thalassa DANS titre' | trans }}</kbd></td> {#<td valign="top"><kbd class="ky">{{ 'thalassa DANS titre' | trans }}</kbd></td>#}
<td valign="top">{{ 'retourne les documents où le terme est au moins présent dans le titre, en évitant par exemple celles où le terme est uniquement cité dans la légende.' | trans }}</td> {#<td valign="top">{{ 'retourne les documents où le terme est au moins présent dans le titre, en évitant par exemple celles où le terme est uniquement cité dans la légende.' | trans }}</td>#}
</tr> {#</tr>#}
</table> {#</table>#}
<center> {#<center>#}
<h3 style="background-color:#CCCCCC; color:#000000">{{ 'Attention' | trans }}</h3> {#<h3 style="background-color:#CCCCCC; color:#000000">{{ 'Attention' | trans }}</h3>#}
<h4> {{ 'pour chercher une phrase contenant un des mots-clé ci-dessus, utilisez les guillemets :' | trans }}</h4> {#<h4> {{ 'pour chercher une phrase contenant un des mots-clé ci-dessus, utilisez les guillemets :' | trans }}</h4>#}
<kbd class='tx'><i>"</i>{{ 'C dans l\'air' | trans }}<i>"</i></kbd> {#<kbd class='tx'><i>"</i>{{ 'C dans l\'air' | trans }}<i>"</i></kbd>#}
, <kbd class='tx'><i>"</i>{{ 'Et Dieu créa la femme' | trans }}<i>"</i></kbd> {#, <kbd class='tx'><i>"</i>{{ 'Et Dieu créa la femme' | trans }}<i>"</i></kbd>#}
, <kbd class='tx'><i>"</i>{{ 'bijou en or' | trans }}<i>"</i></kbd> {#, <kbd class='tx'><i>"</i>{{ 'bijou en or' | trans }}<i>"</i></kbd>#}
, <kbd class='tx'><i>"</i>{{ 'tout le sport' | trans }}<i>"</i></kbd> {#, <kbd class='tx'><i>"</i>{{ 'tout le sport' | trans }}<i>"</i></kbd>#}
</center> {#</center>#}
</div> </div>
{% endblock %} {% endblock %}

45
yarn.lock
View File

@@ -2380,7 +2380,7 @@ global@4.3.0:
min-document "^2.6.1" min-document "^2.6.1"
process "~0.5.1" process "~0.5.1"
global@4.3.2, global@^4.3.1, global@~4.3.0: global@4.3.2, global@^4.3.1, global@^4.3.2, global@~4.3.0:
version "4.3.2" version "4.3.2"
resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f" resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f"
dependencies: dependencies:
@@ -3905,8 +3905,8 @@ lodash.merge@^3.3.2:
lodash.toplainobject "^3.0.0" lodash.toplainobject "^3.0.0"
lodash.merge@^4.6.0: lodash.merge@^4.6.0:
version "4.6.0" version "4.6.1"
resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
lodash.mergewith@^4.6.0: lodash.mergewith@^4.6.0:
version "4.6.0" version "4.6.0"
@@ -5163,9 +5163,9 @@ phantomjs-prebuilt@^2.1.3:
request-progress "^2.0.1" request-progress "^2.0.1"
which "^1.2.10" which "^1.2.10"
phraseanet-common@^0.4.0: phraseanet-common@^0.4.1:
version "0.4.0" version "0.4.1"
resolved "https://registry.yarnpkg.com/phraseanet-common/-/phraseanet-common-0.4.0.tgz#a029b80eb20a9bb6e672dc9fb39f52c6d698b653" resolved "https://registry.yarnpkg.com/phraseanet-common/-/phraseanet-common-0.4.1.tgz#c5a76683cf1a6bf3338d253a6f5417d86b27f5f7"
dependencies: dependencies:
es6-promise "^4.1.1" es6-promise "^4.1.1"
humane-js "^3.2.2" humane-js "^3.2.2"
@@ -5175,8 +5175,8 @@ phraseanet-common@^0.4.0:
pym.js "^1.3.1" pym.js "^1.3.1"
phraseanet-production-client@^0.33.0: phraseanet-production-client@^0.33.0:
version "0.33.0" version "0.33.2"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.33.0.tgz#5c8d8379b0407428a42db28dc771e39abc682525" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.33.2.tgz#a170ebee699dd159f9ca85bd7fcd065f014e2cb5"
dependencies: dependencies:
axios "^0.16.2" axios "^0.16.2"
backbone "^1.3.3" backbone "^1.3.3"
@@ -5202,12 +5202,13 @@ phraseanet-production-client@^0.33.0:
lodash.merge "^4.6.0" lodash.merge "^4.6.0"
mapbox.js "^3.1.1" mapbox.js "^3.1.1"
nouislider "^9.2.0" nouislider "^9.2.0"
phraseanet-common "^0.4.0" phraseanet-common "^0.4.1"
pym.js "^1.3.1" pym.js "^1.3.1"
rx "^4.1.0" rx "^4.1.0"
sprintf-js "^1.1.1" sprintf-js "^1.1.1"
underscore "^1.8.3" underscore "^1.8.3"
video.js "^6.2.4" video.js "^6.2.4"
videojs-flash "^2.1.0"
videojs-hotkeys "^0.2.20" videojs-hotkeys "^0.2.20"
zxcvbn "^4.4.2" zxcvbn "^4.4.2"
@@ -5367,8 +5368,8 @@ punycode@^1.2.4, punycode@^1.4.1:
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
pym.js@^1.3.1: pym.js@^1.3.1:
version "1.3.1" version "1.3.2"
resolved "https://registry.yarnpkg.com/pym.js/-/pym.js-1.3.1.tgz#140cfa9b4bda2e13613e89683e5551c4ce2ac9c4" resolved "https://registry.yarnpkg.com/pym.js/-/pym.js-1.3.2.tgz#0ebd083c5a7ef7650214db872b4b29a10743305d"
qrcode-terminal@~0.11.0: qrcode-terminal@~0.11.0:
version "0.11.0" version "0.11.0"
@@ -6926,9 +6927,9 @@ video.js@^5.11.6, video.js@^5.5.3:
videojs-vtt.js "0.12.4" videojs-vtt.js "0.12.4"
xhr "2.2.2" xhr "2.2.2"
video.js@^6.2.4: video.js@^6.1.0, video.js@^6.2.4:
version "6.6.3" version "6.7.2"
resolved "https://registry.yarnpkg.com/video.js/-/video.js-6.6.3.tgz#6ebf8ca607c95961bf07f0ecbe15f4b30c232d1e" resolved "https://registry.yarnpkg.com/video.js/-/video.js-6.7.2.tgz#4dd2f4c8a9e7ac5cd332806b9f9601f505ba8dad"
dependencies: dependencies:
babel-runtime "^6.9.2" babel-runtime "^6.9.2"
global "4.3.2" global "4.3.2"
@@ -6936,7 +6937,7 @@ video.js@^6.2.4:
tsml "1.0.1" tsml "1.0.1"
videojs-font "2.1.0" videojs-font "2.1.0"
videojs-ie8 "1.1.2" videojs-ie8 "1.1.2"
videojs-vtt.js "0.12.4" videojs-vtt.js "0.12.5"
xhr "2.4.0" xhr "2.4.0"
videojs-chapter-thumbnails@^1.1.2: videojs-chapter-thumbnails@^1.1.2:
@@ -6945,6 +6946,14 @@ videojs-chapter-thumbnails@^1.1.2:
dependencies: dependencies:
video.js "^5.11.6" video.js "^5.11.6"
videojs-flash@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/videojs-flash/-/videojs-flash-2.1.0.tgz#8a262ada96a6f985e4776a1e1612990e8ba19311"
dependencies:
global "^4.3.2"
video.js "^6.1.0"
videojs-swf "5.4.1"
videojs-font@2.0.0: videojs-font@2.0.0:
version "2.0.0" version "2.0.0"
resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-2.0.0.tgz#af7461ef9d4b95e0334bffb78b2f2ff0364a9034" resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-2.0.0.tgz#af7461ef9d4b95e0334bffb78b2f2ff0364a9034"
@@ -6973,6 +6982,12 @@ videojs-vtt.js@0.12.4:
dependencies: dependencies:
global "^4.3.1" global "^4.3.1"
videojs-vtt.js@0.12.5:
version "0.12.5"
resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.12.5.tgz#32852732741c8b4e7a4314caa2cd93646a9c2d40"
dependencies:
global "^4.3.1"
vinyl-file@^2.0.0: vinyl-file@^2.0.0:
version "2.0.0" version "2.0.0"
resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-2.0.0.tgz#a7ebf5ffbefda1b7d18d140fcb07b223efb6751a" resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-2.0.0.tgz#a7ebf5ffbefda1b7d18d140fcb07b223efb6751a"