Merge branch 'master' into PHRAS-2216_Dev_prod_help_About_Refacto

2025-10-23 09:53:15 +00:00 · 2020-02-06 16:54:55 +01:00
parent 8f3b06f37f 3e8b443633
commit 22d5b6e5b5
4 changed files with 136 additions and 25 deletions
--- a/lib/Alchemy/Phrasea/Core/Version.php
+++ b/lib/Alchemy/Phrasea/Core/Version.php
@@ -16,7 +16,7 @@ class Version
    /**
     * @var string
     */
-    private $number = '4.1.0-alpha.19a';
+    private $number = '4.1.0-alpha.20a';

    /**
     * @var string
--- a/lib/classes/patch/410alpha20a.php
+++ b/lib/classes/patch/410alpha20a.php
@@ -0,0 +1,111 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2019 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Alchemy\Phrasea\Application;
+
+class patch_410alpha20a implements patchInterface
+{
+    /** @var string */
+    private $release = '4.1.0-alpha.20a';
+
+    /** @var array */
+    private $concern = [base::DATA_BOX];
+
+    /**
+     * Returns the release version.
+     *
+     * @return string
+     */
+    public function get_release()
+    {
+        return $this->release;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function concern()
+    {
+        return $this->concern;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function require_all_upgrades()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDoctrineMigrations()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply(base $databox, Application $app)
+    {
+        // fix the Longitude value
+
+        $sql = 'SELECT id, record_id, name, value FROM technical_datas WHERE trim(name) = "LongitudeRef" ';
+        $stmt = $databox->get_connection()->prepare($sql);
+        $stmt->execute();
+        $rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        $stmt->closeCursor();
+
+        foreach ($rs as $row) {
+            if (trim($row['value']) === 'W' ) {
+                $sql = 'UPDATE technical_datas SET value = CONCAT("-", value) WHERE trim(name) = "Longitude" AND record_id =:record_id';
+                $stmt = $databox->get_connection()->prepare($sql);
+                $stmt->execute([':record_id' => $row['record_id']]);
+            }
+
+            $sqlDelete = 'DELETE FROM technical_datas WHERE id =:id';
+
+            $stmt1 = $databox->get_connection()->prepare($sqlDelete);
+            $stmt1->execute([':id' => $row['id']]);
+            $stmt1->closeCursor();
+        }
+
+        $stmt->closeCursor();
+
+        // fix the Latitude value
+
+        $sql = 'SELECT id, record_id, name, value FROM technical_datas WHERE trim(name) = "LatitudeRef" ';
+        $stmt = $databox->get_connection()->prepare($sql);
+        $stmt->execute();
+        $rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        $stmt->closeCursor();
+
+        foreach ($rs as $row) {
+            if (trim($row['value']) === 'S' ) {
+                $sql = 'UPDATE technical_datas SET value = CONCAT("-", value) WHERE trim(name) = "Latitude" AND record_id =:record_id';
+                $stmt = $databox->get_connection()->prepare($sql);
+                $stmt->execute([':record_id' => $row['record_id']]);
+            }
+
+            $sqlDelete = 'DELETE FROM technical_datas WHERE id =:id';
+
+            $stmt1 = $databox->get_connection()->prepare($sqlDelete);
+            $stmt1->execute([':id' => $row['id']]);
+            $stmt1->closeCursor();
+        }
+
+        $stmt->closeCursor();
+
+        return true;
+    }
+}
--- a/resources/locales/messages.en.xlf
+++ b/resources/locales/messages.en.xlf
@@ -1,4 +1,4 @@
-<?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="2020-02-04T09:01:47Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
    <header>
@@ -7,8 +7,8 @@
    </header>
    <body>
      <trans-unit id="da39a3ee5e6b4b0d3255bfef95601890afd80709" resname="">
-        <source></source>
-        <target state="new"></target>
+        <source/>
+        <target state="new"/>
        <jms:reference-file line="60">Form/Login/PhraseaAuthenticationForm.php</jms:reference-file>
        <jms:reference-file line="47">Form/Configuration/EmailFormType.php</jms:reference-file>
      </trans-unit>
@@ -11174,9 +11174,9 @@
        <target state="translated">Thumbnails</target>
        <jms:reference-file line="51">prod/actions/printer_default.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="55f21f807565b041654d25f1167637cfdb1b272c" resname="print_feedback:: Document generated on : ">
+      <trans-unit id="55f21f807565b041654d25f1167637cfdb1b272c" resname="print_feedback:: Document generated on : " approved="yes">
        <source>print_feedback:: Document generated on : </source>
-        <target state="new">print_feedback:: Document generated on : </target>
+        <target state="translated">Generated on :</target>
        <jms:reference-file line="399">Out/Module/PDFRecords.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="cc26097dfc5a781b1ed04e28740f7e404ff3465a" resname="print_feedback:: Feedback active" approved="yes">
@@ -11189,19 +11189,19 @@
        <target state="translated">Feedback session closed</target>
        <jms:reference-file line="423">Out/Module/PDFRecords.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="c5ed38188b58f5550c4e95b2e435f13a24fc0085" resname="print_feedback:: Feedback expiring on : ">
+      <trans-unit id="c5ed38188b58f5550c4e95b2e435f13a24fc0085" resname="print_feedback:: Feedback expiring on : " approved="yes">
        <source>print_feedback:: Feedback expiring on : </source>
-        <target state="new">print_feedback:: Feedback expiring on : </target>
+        <target state="translated">Feedback expiring on :</target>
        <jms:reference-file line="417">Out/Module/PDFRecords.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="ab0fd755a204e2da76f99dfd4d492d24e8474edb" resname="print_feedback:: Feedback initiated by : ">
+      <trans-unit id="ab0fd755a204e2da76f99dfd4d492d24e8474edb" resname="print_feedback:: Feedback initiated by : " approved="yes">
        <source>print_feedback:: Feedback initiated by : </source>
-        <target state="new">print_feedback:: Feedback initiated by : </target>
+        <target state="translated">Feedback initiated by :</target>
        <jms:reference-file line="405">Out/Module/PDFRecords.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="da5dba0c0f395815ac7dded599792c02606aefe2" resname="print_feedback:: Feedback initiated on : ">
+      <trans-unit id="da5dba0c0f395815ac7dded599792c02606aefe2" resname="print_feedback:: Feedback initiated on : " approved="no">
        <source>print_feedback:: Feedback initiated on : </source>
-        <target state="new">print_feedback:: Feedback initiated on : </target>
+        <target state="needs-translation">Feedback initiated on :</target>
        <jms:reference-file line="411">Out/Module/PDFRecords.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="bd80725e7265da3a6fc6077dcf79d4a62494bc75" resname="print_feedback:: Feedback on basket %name%" approved="yes">
--- a/resources/locales/messages.fr.xlf
+++ b/resources/locales/messages.fr.xlf
@@ -1,4 +1,4 @@
-<?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="2020-02-04T09:02:07Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
    <header>
@@ -7,8 +7,8 @@
    </header>
    <body>
      <trans-unit id="da39a3ee5e6b4b0d3255bfef95601890afd80709" resname="">
-        <source></source>
-        <target state="new"></target>
+        <source/>
+        <target state="new"/>
        <jms:reference-file line="60">Form/Login/PhraseaAuthenticationForm.php</jms:reference-file>
        <jms:reference-file line="47">Form/Configuration/EmailFormType.php</jms:reference-file>
      </trans-unit>
@@ -11174,9 +11174,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <target state="translated">Planche contact</target>
        <jms:reference-file line="51">prod/actions/printer_default.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="55f21f807565b041654d25f1167637cfdb1b272c" resname="print_feedback:: Document generated on : ">
+      <trans-unit id="55f21f807565b041654d25f1167637cfdb1b272c" resname="print_feedback:: Document generated on : " approved="yes">
        <source>print_feedback:: Document generated on : </source>
-        <target state="new">print_feedback:: Document generated on : </target>
+        <target state="translated">Impression générée le :</target>
        <jms:reference-file line="399">Out/Module/PDFRecords.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="cc26097dfc5a781b1ed04e28740f7e404ff3465a" resname="print_feedback:: Feedback active" approved="yes">
@@ -11189,19 +11189,19 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <target state="translated">Validation Fermée</target>
        <jms:reference-file line="423">Out/Module/PDFRecords.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="c5ed38188b58f5550c4e95b2e435f13a24fc0085" resname="print_feedback:: Feedback expiring on : ">
+      <trans-unit id="c5ed38188b58f5550c4e95b2e435f13a24fc0085" resname="print_feedback:: Feedback expiring on : " approved="yes">
        <source>print_feedback:: Feedback expiring on : </source>
-        <target state="new">print_feedback:: Feedback expiring on : </target>
+        <target state="translated">Expire le :</target>
        <jms:reference-file line="417">Out/Module/PDFRecords.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="ab0fd755a204e2da76f99dfd4d492d24e8474edb" resname="print_feedback:: Feedback initiated by : ">
+      <trans-unit id="ab0fd755a204e2da76f99dfd4d492d24e8474edb" resname="print_feedback:: Feedback initiated by : " approved="yes">
        <source>print_feedback:: Feedback initiated by : </source>
-        <target state="new">print_feedback:: Feedback initiated by : </target>
+        <target state="translated">Validation envoyée par :</target>
        <jms:reference-file line="405">Out/Module/PDFRecords.php</jms:reference-file>
      </trans-unit>
-      <trans-unit id="da5dba0c0f395815ac7dded599792c02606aefe2" resname="print_feedback:: Feedback initiated on : ">
+      <trans-unit id="da5dba0c0f395815ac7dded599792c02606aefe2" resname="print_feedback:: Feedback initiated on : " approved="no">
        <source>print_feedback:: Feedback initiated on : </source>
-        <target state="new">print_feedback:: Feedback initiated on : </target>
+        <target state="needs-translation">Début de validation le :</target>
        <jms:reference-file line="411">Out/Module/PDFRecords.php</jms:reference-file>
      </trans-unit>
      <trans-unit id="bd80725e7265da3a6fc6077dcf79d4a62494bc75" resname="print_feedback:: Feedback on basket %name%" approved="yes">
@@ -11433,9 +11433,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
        <target state="translated">Nom de la validation</target>
        <jms:reference-file line="153">prod/templates/push.html.twig</jms:reference-file>
      </trans-unit>
-      <trans-unit id="dee7c522bf9e0eea45e003fb4d0f736bc251a954" resname="prod::push:push_set_title">
+      <trans-unit id="dee7c522bf9e0eea45e003fb4d0f736bc251a954" resname="prod::push:push_set_title" approved="yes">
        <source>prod::push:push_set_title</source>
-        <target state="needs-translation">Nom du panier de Push</target>
+        <target state="translated">Nom du panier de Push</target>
        <jms:reference-file line="154">prod/templates/push.html.twig</jms:reference-file>
      </trans-unit>
      <trans-unit id="2a4d65f9a1aaeec92617d3d5dc3ef0167a019e82" resname="prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee." approved="yes">