Fix locales extraction

2025-10-18 07:23:13 +00:00 · 2015-03-10 10:26:06 +01:00
parent 1576c2f159
commit 9ee42e44fe
14 changed files with 27280 additions and 26806 deletions
--- a/composer.json
+++ b/composer.json
@@ -21,6 +21,10 @@
        {
            "type": "vcs",
            "url": "https://github.com/alchemy-fr/phpexiftool"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/alchemy-fr/JMSTranslationBundle"
        }
    ],
    "require": {
@@ -45,7 +49,7 @@
        "igorw/get-in"                     : "~1.0",
        "ircmaxell/random-lib"             : "~1.0",
        "jms/serializer"                   : "~0.10",
-        "jms/translation-bundle"           : "~1.1",
+        "jms/translation-bundle"           : "dev-master as 1.1.0",
        "justinrainbow/json-schema"        : "~1.3",
        "mediavorus/mediavorus"            : "~0.4.0",
        "media-alchemyst/media-alchemyst"  : "~0.4",
--- a/composer.lock
+++ b/composer.lock
@@ -4,16 +4,22 @@
        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
        "This file is @generated automatically"
    ],
-    "hash": "d61597ae74766f83e4fa112d2992a65c",
+    "hash": "a247450fbe726a4062e2380fc207001d",
    "packages": [
        {
            "name": "alchemy-fr/tcpdf-clone",
            "version": "6.0.039",
            "source": {
                "type": "git",
-                "url": "https://github.com/alchemy-fr/tcpdf-clone",
+                "url": "https://github.com/alchemy-fr/tcpdf-clone.git",
                "reference": "2ba0248a7187f1626df6c128750650416267f0e7"
            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/alchemy-fr/tcpdf-clone/zipball/2ba0248a7187f1626df6c128750650416267f0e7",
+                "reference": "2ba0248a7187f1626df6c128750650416267f0e7",
+                "shasum": ""
+            },
            "require": {
                "php": ">=5.3.0"
            },
@@ -60,6 +66,10 @@
                "qrcode",
                "tcpdf"
            ],
+            "support": {
+                "source": "https://github.com/alchemy-fr/tcpdf-clone/tree/6.0.039",
+                "issues": "https://github.com/alchemy-fr/tcpdf-clone/issues"
+            },
            "time": "2013-10-13 16:11:17"
        },
        {
@@ -103,7 +113,7 @@
                    "homepage": "http://www.lickmychip.com/"
                },
                {
-                    "name": "Nicolas Le Goff",
+                    "name": "nlegoff",
                    "email": "legoff.n@gmail.com"
                },
                {
@@ -1261,13 +1271,13 @@
            "version": "v1.0.0",
            "source": {
                "type": "git",
-                "url": "https://github.com/igorw/evenement",
-                "reference": "v1.0.0"
+                "url": "https://github.com/igorw/evenement.git",
+                "reference": "fa966683e7df3e5dd5929d984a44abfbd6bafe8d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://github.com/igorw/evenement/zipball/v1.0.0",
-                "reference": "v1.0.0",
+                "url": "https://api.github.com/repos/igorw/evenement/zipball/fa966683e7df3e5dd5929d984a44abfbd6bafe8d",
+                "reference": "fa966683e7df3e5dd5929d984a44abfbd6bafe8d",
                "shasum": ""
            },
            "require": {
@@ -1294,19 +1304,19 @@
            "keywords": [
                "event-dispatcher"
            ],
-            "time": "2012-05-30 08:01:08"
+            "time": "2012-05-30 15:01:08"
        },
        {
            "name": "facebook/php-sdk",
            "version": "v3.2.3",
            "source": {
                "type": "git",
-                "url": "https://github.com/facebook/facebook-php-sdk.git",
+                "url": "https://github.com/facebookarchive/facebook-php-sdk.git",
                "reference": "6714042fa2f5979d4c64c7d11fb4bcab16bdf6cb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/facebook/facebook-php-sdk/zipball/6714042fa2f5979d4c64c7d11fb4bcab16bdf6cb",
+                "url": "https://api.github.com/repos/facebookarchive/facebook-php-sdk/zipball/6714042fa2f5979d4c64c7d11fb4bcab16bdf6cb",
                "reference": "6714042fa2f5979d4c64c7d11fb4bcab16bdf6cb",
                "shasum": ""
            },
@@ -1340,6 +1350,7 @@
                "facebook",
                "sdk"
            ],
+            "abandoned": "facebook/php-sdk-v4",
            "time": "2013-11-19 23:11:14"
        },
        {
@@ -1928,17 +1939,17 @@
        },
        {
            "name": "jms/translation-bundle",
-            "version": "1.1.0",
+            "version": "dev-master",
            "target-dir": "JMS/TranslationBundle",
            "source": {
                "type": "git",
-                "url": "https://github.com/schmittjoh/JMSTranslationBundle.git",
-                "reference": "6f03035a38badaf8c48767c7664c3196df1eebdf"
+                "url": "https://github.com/alchemy-fr/JMSTranslationBundle.git",
+                "reference": "808d11543fc9c1abc20dcf6b4d99e066c6a955da"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/JMSTranslationBundle/zipball/6f03035a38badaf8c48767c7664c3196df1eebdf",
-                "reference": "6f03035a38badaf8c48767c7664c3196df1eebdf",
+                "url": "https://api.github.com/repos/alchemy-fr/JMSTranslationBundle/zipball/808d11543fc9c1abc20dcf6b4d99e066c6a955da",
+                "reference": "808d11543fc9c1abc20dcf6b4d99e066c6a955da",
                "shasum": ""
            },
            "require": {
@@ -1974,16 +1985,13 @@
                    "JMS\\TranslationBundle": ""
                }
            },
-            "notification-url": "https://packagist.org/downloads/",
            "license": [
                "Apache2"
            ],
            "authors": [
                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh",
-                    "role": "Developer of wrapped JMSSerializerBundle"
+                    "name": "Johannes M. Schmitt",
+                    "email": "schmittjoh@gmail.com"
                }
            ],
            "description": "Puts the Symfony2 Translation Component on steroids",
@@ -1998,7 +2006,10 @@
                "ui",
                "webinterface"
            ],
-            "time": "2013-06-08 14:08:19"
+            "support": {
+                "source": "https://github.com/alchemy-fr/JMSTranslationBundle/tree/master"
+            },
+            "time": "2015-03-09 17:01:23"
        },
        {
            "name": "justinrainbow/json-schema",
@@ -2298,7 +2309,7 @@
            ],
            "authors": [
                {
-                    "name": "Stephen Clay",
+                    "name": "Steve Clay",
                    "email": "steve@mrclay.org",
                    "homepage": "http://www.mrclay.org/",
                    "role": "Developer"
@@ -2484,21 +2495,21 @@
            "source": {
                "type": "git",
                "url": "https://github.com/romainneutron/Imagine-Silex-Service-Provider.git",
-                "reference": "0.1.2"
+                "reference": "a8a7862ae90419f2b23746cd8436c2310e4eb084"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/romainneutron/Imagine-Silex-Service-Provider/zipball/0.1.2",
-                "reference": "0.1.2",
+                "url": "https://api.github.com/repos/romainneutron/Imagine-Silex-Service-Provider/zipball/a8a7862ae90419f2b23746cd8436c2310e4eb084",
+                "reference": "a8a7862ae90419f2b23746cd8436c2310e4eb084",
                "shasum": ""
            },
            "require": {
                "imagine/imagine": "*",
                "php": ">=5.3.3",
-                "silex/silex": ">=1.0,<2.0"
+                "silex/silex": "~1.0"
            },
            "require-dev": {
-                "symfony/browser-kit": ">=2.0,<3.0"
+                "symfony/browser-kit": "~2.0"
            },
            "type": "library",
            "autoload": {
@@ -3012,7 +3023,7 @@
                "metadata"
            ],
            "support": {
-                "source": "https://github.com/alchemy-fr/PHPExiftool/tree/0.4.1-mwg-metadata-copy"
+                "source": "https://github.com/alchemy-fr/PHPExiftool/tree/dev"
            },
            "time": "2014-10-08 16:09:02"
        },
@@ -3679,7 +3690,7 @@
                },
                {
                    "name": "Phraseanet Team",
-                    "email": "support@alchemy.fr",
+                    "email": "info@alchemy.fr",
                    "homepage": "http://www.phraseanet.com/"
                }
            ],
@@ -5078,6 +5089,12 @@
            "version": "dev-alchemy-0.6.2",
            "package": "imagine/imagine"
        },
+        {
+            "alias": "1.1.0",
+            "alias_normalized": "1.1.0.0",
+            "version": "9999999-dev",
+            "package": "jms/translation-bundle"
+        },
        {
            "alias": "0.4.1",
            "alias_normalized": "0.4.1.0",
@@ -5091,6 +5108,7 @@
        "alchemy/zippy": 20,
        "goodby/csv": 20,
        "imagine/imagine": 20,
+        "jms/translation-bundle": 20,
        "neutron/process-manager": 20,
        "phpexiftool/phpexiftool": 20,
        "silex/silex": 20,
--- a/lib/Alchemy/Phrasea/Form/Configuration/EmailFormType.php
+++ b/lib/Alchemy/Phrasea/Form/Configuration/EmailFormType.php
@@ -44,7 +44,7 @@ class EmailFormType extends AbstractType
            'label'        => 'SMTP user',
        ]);
        $builder->add('hidden-password', 'password', [
-            'label' => false,
+            'label' => '',
            'attr' =>  [
                'style' => 'display:none'
            ]
--- a/lib/Alchemy/Phrasea/Form/Login/PhraseaAuthenticationForm.php
+++ b/lib/Alchemy/Phrasea/Form/Login/PhraseaAuthenticationForm.php
@@ -48,7 +48,7 @@ class PhraseaAuthenticationForm extends AbstractType

        if ($this->app['phraseanet.configuration']['session']['idle'] < 1) {
            $builder->add('remember-me', 'checkbox' , [
-                'label'    =>  _('Remember me'),
+                'label'    =>  'Remember me',
                'mapped'   => false,
                'required' => false,
                'attr'     => [
--- a/lib/classes/caption/record.php
+++ b/lib/classes/caption/record.php
@@ -193,7 +193,7 @@ class caption_record implements caption_interface, cache_cacheableInterface
            $fields[$field->get_name()] = [
                'values'    => $values,
                'name'      => $field->get_name(),
-                'label'     => $field->get_databox_field()->get_label($this->app['locale']),
+                'label_name'     => $field->get_databox_field()->get_label($this->app['locale']),
                'separator' => $field->get_databox_field()->get_separator(),
                'sbas_id'   => $field->get_databox_field()->get_databox()->get_sbas_id()
            ];
--- a/resources/locales/messages.de.xlf
+++ b/resources/locales/messages.de.xlf
--- a/resources/locales/messages.en.xlf
+++ b/resources/locales/messages.en.xlf
--- a/resources/locales/messages.fr.xlf
+++ b/resources/locales/messages.fr.xlf
--- a/resources/locales/messages.nl.xlf
+++ b/resources/locales/messages.nl.xlf
--- a/resources/locales/validators.de.xlf
+++ b/resources/locales/validators.de.xlf
@@ -1,17 +1,17 @@
 <?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="2014-02-11T14:21:21Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
+  <file date="2015-03-09T18:08:03Z" 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>
    </header>
    <body>
      <trans-unit id="96f0767cb7ea65a7f86c8c9432e80d16cf9d8680" resname="Please provide the same passwords.">
-        <jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
-        <jms:reference-file line="50">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
-        <jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
        <source>Please provide the same passwords.</source>
        <target state="new">Please provide the same passwords.</target>
+        <jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
+        <jms:reference-file line="51">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
+        <jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore">
        <source>The token provided is not valid anymore</source>
--- a/resources/locales/validators.en.xlf
+++ b/resources/locales/validators.en.xlf
@@ -1,17 +1,17 @@
 <?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="2014-02-11T14:23:06Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
+  <file date="2015-03-09T18:10:31Z" 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="96f0767cb7ea65a7f86c8c9432e80d16cf9d8680" resname="Please provide the same passwords.">
-        <jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
-        <jms:reference-file line="50">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
-        <jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
        <source>Please provide the same passwords.</source>
        <target state="new">Please provide the same passwords.</target>
+        <jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
+        <jms:reference-file line="51">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
+        <jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore">
        <source>The token provided is not valid anymore</source>
--- a/resources/locales/validators.fr.xlf
+++ b/resources/locales/validators.fr.xlf
@@ -1,17 +1,17 @@
 <?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="2014-02-11T14:25:05Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
+  <file date="2015-03-09T18:13:15Z" 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="96f0767cb7ea65a7f86c8c9432e80d16cf9d8680" resname="Please provide the same passwords.">
-        <jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
-        <jms:reference-file line="50">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
-        <jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
        <source>Please provide the same passwords.</source>
        <target state="new">Please provide the same passwords.</target>
+        <jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
+        <jms:reference-file line="51">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
+        <jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore">
        <source>The token provided is not valid anymore</source>
--- a/resources/locales/validators.nl.xlf
+++ b/resources/locales/validators.nl.xlf
@@ -1,17 +1,17 @@
 <?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="2014-02-11T14:27:16Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
+  <file date="2015-03-09T18:16:13Z" 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>
    </header>
    <body>
      <trans-unit id="96f0767cb7ea65a7f86c8c9432e80d16cf9d8680" resname="Please provide the same passwords.">
-        <jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
-        <jms:reference-file line="50">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
-        <jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
        <source>Please provide the same passwords.</source>
        <target state="new">Please provide the same passwords.</target>
+        <jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
+        <jms:reference-file line="51">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
+        <jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore">
        <source>The token provided is not valid anymore</source>
--- a/templates/web/common/macros.html.twig
+++ b/templates/web/common/macros.html.twig
@@ -97,7 +97,7 @@

 {% macro caption_field(field, bounceable, extra_classes) %}
    <div class="desc {{ extra_classes|join(' ') }}">
-        <b>{{ field.label }}</b> :
+        <b>{{ field.label_name }}</b> :
        {{ _self.caption_value(field, bounceable|default(true))|highlight|linkify }}
    </div>
 {% endmacro %}