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

porting PHRAS-1589 to 4.1

Browse Source
This commit is contained in:
Mike Ng
2017-12-22 16:04:02 +04:00
parent 0d7c2bd52d
commit 1aa919cc08
10 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Alchemy/Phrasea/Controller/Prod/ExportController.php
View File

@@ -168,11 +168,11 @@ class ExportController extends Controller
$request->request->get('businessfields')
);
$separator = preg_split('//', ' ;,', -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
$separator = '/\\' . implode('|\\', $separator) . '/';
$list['export_name'] = sprintf("%s.zip", $download->getExportName());
$list['email'] = implode(';', preg_split($separator, $request->request->get("destmail", "")));
$separator = '/\ |\;|\,/';
// add PREG_SPLIT_NO_EMPTY to only return non-empty values
$list['email'] = implode(';', preg_split($separator, $request->request->get("destmail", ""), -1, PREG_SPLIT_NO_EMPTY));
$destMails = [];
//get destination mails

7
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="2017-11-21T11:34:06Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<file date="2017-12-22T11:45: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>
@@ -9475,6 +9475,11 @@
<jms:reference-file line="103">web/common/dialog_export.html.twig</jms:reference-file>
<jms:reference-file line="116">web/common/dialog_export.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="fcf5093722566a47fe3e773296cc63fac7190dac" resname="export::export-email: email-invalid">
<source>export::export-email: email-invalid</source>
<target state="new">export::export-email: email-invalid</target>
<jms:reference-file line="510">web/common/dialog_export.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="40a92233bac9303de825031d1954e6b109088b38" resname="export::ftp: reglages manuels" approved="yes">
<source>export::ftp: reglages manuels</source>
<target state="translated">manuelle Einstellungen</target>

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

@@ -1,14 +1,14 @@
<?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">
<file date="2017-11-21T11:34:47Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
<file date="2017-12-22T11:46:19Z" source-language="en" target-language="en" 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>
</header>
<body>
<trans-unit id="da39a3ee5e6b4b0d3255bfef95601890afd80709" resname="">
<source/>
<target state="new"/>
<source></source>
<target state="new"></target>
<jms:reference-file line="47">Form/Configuration/EmailFormType.php</jms:reference-file>
<jms:reference-file line="60">Form/Login/PhraseaAuthenticationForm.php</jms:reference-file>
</trans-unit>
@@ -2232,7 +2232,7 @@
<jms:reference-file line="45">prod/results/entry.html.twig</jms:reference-file>
<jms:reference-file line="39">prod/results/feeds_entry.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="dcce9368ad626fe4addfa719b7a16807d464aa9b" resname="Derniers envois" approved="no">
<trans-unit id="dcce9368ad626fe4addfa719b7a16807d464aa9b" resname="Derniers envois">
<source>Derniers envois</source>
<target state="needs-translation">Last sent</target>
<jms:reference-file line="126">web/developers/application.html.twig</jms:reference-file>
@@ -4625,7 +4625,7 @@
<target state="translated">Past year</target>
<jms:reference-file line="60">WorkZone/Browser/Browser.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="781961bc81c25697841ecce5d4d9dad9f6b261c6" resname="Pause" approved="no">
<trans-unit id="781961bc81c25697841ecce5d4d9dad9f6b261c6" resname="Pause">
<source>Pause</source>
<target state="needs-translation">Pause</target>
<jms:reference-file line="122">Controller/Prod/LanguageController.php</jms:reference-file>
@@ -6995,7 +6995,7 @@
<target state="translated">Users suggestion</target>
<jms:reference-file line="134">prod/actions/Push.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="a56fad2f92979e0171b42bbc51ff5657d17ceb91" resname="Utilisation prevue:" approved="no">
<trans-unit id="a56fad2f92979e0171b42bbc51ff5657d17ceb91" resname="Utilisation prevue:">
<source>Utilisation prevue:</source>
<target state="needs-translation">Intended use:</target>
<jms:reference-file line="238">prod/orders/order_item.html.twig</jms:reference-file>
@@ -9476,6 +9476,11 @@
<jms:reference-file line="103">web/common/dialog_export.html.twig</jms:reference-file>
<jms:reference-file line="116">web/common/dialog_export.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="fcf5093722566a47fe3e773296cc63fac7190dac" resname="export::export-email: email-invalid">
<source>export::export-email: email-invalid</source>
<target state="new">export::export-email: email-invalid</target>
<jms:reference-file line="510">web/common/dialog_export.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="40a92233bac9303de825031d1954e6b109088b38" resname="export::ftp: reglages manuels" approved="yes">
<source>export::ftp: reglages manuels</source>
<target state="translated">Manual settings</target>

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

@@ -1,14 +1,14 @@
<?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">
<file date="2017-11-21T11:35:35Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
<file date="2017-12-22T11:47:11Z" source-language="en" target-language="fr" 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>
</header>
<body>
<trans-unit id="da39a3ee5e6b4b0d3255bfef95601890afd80709" resname="">
<source/>
<target state="new"/>
<source></source>
<target state="new"></target>
<jms:reference-file line="47">Form/Configuration/EmailFormType.php</jms:reference-file>
<jms:reference-file line="60">Form/Login/PhraseaAuthenticationForm.php</jms:reference-file>
</trans-unit>
@@ -6296,7 +6296,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
<jms:reference-file line="6">web/login/cgus.html.twig</jms:reference-file>
<jms:reference-file line="74">login/layout/base-layout.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="903b3a1a72b51b7b51f85ec8c81def53ed9c9b0c" resname="The Phraseanet Web API allows other web application to rely on this instance" approved="no">
<trans-unit id="903b3a1a72b51b7b51f85ec8c81def53ed9c9b0c" resname="The Phraseanet Web API allows other web application to rely on this instance">
<source>The Phraseanet Web API allows other web application to rely on this instance</source>
<target state="needs-translation">L'API Web Phraseanet permet à d'autres applications web de se reposer sur cette instance</target>
<jms:reference-file line="23">Form/Configuration/APIClientsFormType.php</jms:reference-file>
@@ -6997,7 +6997,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
<target state="translated">Suggestion d'utilisateurs</target>
<jms:reference-file line="134">prod/actions/Push.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="a56fad2f92979e0171b42bbc51ff5657d17ceb91" resname="Utilisation prevue:" approved="no">
<trans-unit id="a56fad2f92979e0171b42bbc51ff5657d17ceb91" resname="Utilisation prevue:">
<source>Utilisation prevue:</source>
<target state="needs-translation">Utilisation prévue:</target>
<jms:reference-file line="238">prod/orders/order_item.html.twig</jms:reference-file>
@@ -9479,6 +9479,11 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<jms:reference-file line="103">web/common/dialog_export.html.twig</jms:reference-file>
<jms:reference-file line="116">web/common/dialog_export.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="fcf5093722566a47fe3e773296cc63fac7190dac" resname="export::export-email: email-invalid">
<source>export::export-email: email-invalid</source>
<target state="new">export::export-email: email-invalid</target>
<jms:reference-file line="510">web/common/dialog_export.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="40a92233bac9303de825031d1954e6b109088b38" resname="export::ftp: reglages manuels" approved="yes">
<source>export::ftp: reglages manuels</source>
<target state="translated">Réglages manuels</target>

7
resources/locales/messages.nl.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="2017-11-21T11:36:28Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
<file date="2017-12-22T11:48:10Z" source-language="en" target-language="nl" 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>
@@ -9479,6 +9479,11 @@
<jms:reference-file line="103">web/common/dialog_export.html.twig</jms:reference-file>
<jms:reference-file line="116">web/common/dialog_export.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="fcf5093722566a47fe3e773296cc63fac7190dac" resname="export::export-email: email-invalid">
<source>export::export-email: email-invalid</source>
<target state="new">export::export-email: email-invalid</target>
<jms:reference-file line="510">web/common/dialog_export.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="40a92233bac9303de825031d1954e6b109088b38" resname="export::ftp: reglages manuels" approved="yes">
<source>export::ftp: reglages manuels</source>
<target state="translated">Manuele instellingen</target>

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="2017-11-21T11:34:06Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<file date="2017-12-22T11:45:35Z" 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>

2
resources/locales/validators.en.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="2017-11-21T11:34:47Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
<file date="2017-12-22T11:46:20Z" source-language="en" target-language="en" 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>

2
resources/locales/validators.fr.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="2017-11-21T11:35:35Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
<file date="2017-12-22T11:47:12Z" source-language="en" target-language="fr" 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>

2
resources/locales/validators.nl.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="2017-11-21T11:36:29Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
<file date="2017-12-22T11:48:10Z" source-language="en" target-language="nl" 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>

3
templates/web/common/dialog_export.html.twig
View File

@@ -506,7 +506,8 @@
fileTooLargeAlt: '{{ 'You can alternatively receive an email when the download is ready.' | trans | e('js') }}',
fileTooLargeEmail: '{{ 'Would you like to receive an e-mail when your download is ready ?' | trans | e('js') }}',
success: '{{ "Success" | trans | e('js') }}',
warning: '{{ "Warning !" | trans | e('js') }}'
warning: '{{ "Warning !" | trans | e('js') }}',
invalidEmail: '{{ 'export::export-email: email-invalid' | trans }}'
},
user: {
email: '{{app.getAuthenticatedUser().getEmail() | e('js')}}'