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

Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2184-list-manager-email-domain-filter

Browse Source
This commit is contained in:
aynsix
2020-04-22 13:58:02 +03:00
parent 620943c2cf 90cd595834
commit ada4702d92
14 changed files with 742 additions and 814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Controller/Prod/PushController.php
View File

@@ -628,7 +628,7 @@ class PushController extends Controller
$manager->persist($validation);
$manager->flush();
$manager->commit();
$ret['message'] = $this->app->trans('Expiration date successfully updated!');
$ret['message'] = 'Expiration date successfully updated!';
} catch (\Exception $e) {
$ret['message'] = $e->getMessage();
$manager->rollback();

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.177-d",
"phraseanet-production-client": "0.34.178-d",
"requirejs": "^2.3.5",
"tinymce": "^4.0.28",
"underscore": "^1.8.3",

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

375
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"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2020-04-14T16:33:28Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<file date="2020-04-21T11:42:09Z" 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="2020-04-14T16:33:52Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
<file date="2020-04-21T11:42:33Z" 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="2020-04-14T16:34:20Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
<file date="2020-04-21T11:42:59Z" 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="2020-04-14T16:34:50Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
<file date="2020-04-21T11:43:29Z" 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>

2
templates/web/prod/Share/record.html.twig
View File

@@ -17,7 +17,7 @@
</span>
</p>
<p>
<a id="twitter-link" href="http://www.twitter.com/home/?status={{ subdefList[defKey].permaviewUrl }}"
<a id="twitter-link" href="https://twitter.com/intent/tweet?text={{ subdefList[defKey].permaviewUrl }}"
target="_blank">
<img src="/assets/common/images/icons/twitter.png" title="share this on twitter"
style="width:25px;vertical-align:middle;padding:0 5px;"/>

4
templates/web/prod/WorkZone/Basket.html.twig
View File

@@ -161,10 +161,10 @@
});
$( function() {
$.datepicker.regional['default'] = {
closeText: "{{ 'workzone:datepicker:closeText' | trans }}",
closeText: "Close",
prevText: "{{ 'workzone:datepicker:prevText' | trans }}",
nextText: "{{ 'workzone:datepicker:nextText' | trans }}",
currentText: "{{ 'workzone:datepicker:currentText' | trans }}",
currentText: "Today",
monthNames: [ "{{ 'workzone:datepicker:january' | trans }}", "{{ 'workzone:datepicker:february' | trans }}", "{{ 'workzone:datepicker:march' | trans }}", "{{ 'workzone:datepicker:april' | trans }}", "{{ 'workzone:datepicker:may' | trans }}", "{{ 'workzone:datepicker:june' | trans }}",
"{{ 'workzone:datepicker:july' | trans }}", "{{ 'workzone:datepicker:august' | trans }}", "{{ 'workzone:datepicker:september' | trans }}", "{{ 'workzone:datepicker:october' | trans }}", "{{ 'workzone:datepicker:november' | trans }}", "{{ 'workzone:datepicker:december' | trans }}" ],
dayNames: [ "{{ 'workzone:datepicker:sunday' | trans }}", "{{ 'workzone:datepicker:monday' | trans }}", "{{ 'workzone:datepicker:tuesday' | trans }}", "{{ 'workzone:datepicker:wednesday' | trans }}", "{{ 'workzone:datepicker:thursday' | trans }}", "{{ 'workzone:datepicker:friday' | trans }}", "{{ 'workzone:datepicker:saturday' | trans }}" ],

10
templates/web/prod/WorkZone/Browser/Results.html.twig
View File

@@ -4,9 +4,13 @@
<table>
<tr>
<td>
{% transchoice Total %}
{0} No results|{1} Result|]1,Inf[ Results
{% endtranschoice %}
{% if Total == 0 %}
{{ 'No results' | trans }}
{% elseif Total == 1 %}
{{ '1 result' | trans }}
{% else %}
{% trans with {'%Total%' : Total} %}%Total% results{% endtrans %}
{% endif %}
</td>
</tr>
</table>

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.177-d:
version "0.34.177-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.177-d.tgz#5f224c0309e64e9d26f5dfcaf6faf2e84b5045cb"
integrity sha512-b5z5huXd+3FYJx2cRMA9EpQ2sxytYdnMlsj5jf2XC8mSk7znhchd1lbry686h2dUpOgUZAcr6gTbDUYwnzFUMQ==
phraseanet-production-client@0.34.178-d:
version "0.34.178-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.178-d.tgz#70232ba27514d2da1b3e414bfdfb7912446f3d6f"
integrity sha512-UbS99joSPuG1B0CLc3lIuSYclRr4USno0fE5WesC2vXlNGHgXNvIf9aRgJ7i/9x/3G/9WC00EPS/0fBlNvC8mQ==
dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6"