Fix missing keys

Author: olivierperez

OPSession.inc.zip

@@ -19,6 +19,6 @@
 
 require_once '../app/inc/init.php';
 
-$smarty->assign('title', _('Administration'));
+$smarty->assign('title', __('Admin', 'Administration'));
 $smarty->assign('logsAreReadable', is_readable('../' . LOG_FILE));
 $smarty->display('admin/index.tpl');

admin/index.php

@@ -23,9 +23,7 @@
 is_readable('../' . LOG_FILE) ? readfile('../' . LOG_FILE) : null;
 $content = ob_get_clean();
 
-$smarty->assign('title', _('Administration'));
 $smarty->assign('logs', $content);
-
 $smarty->assign('title', __('Admin', 'Logs'));
 
 $smarty->display('admin/logs.tpl');

admin/logs.php

@@ -46,7 +46,7 @@
 
 if ($action === 'purge' && $securityService->checkCsrf('admin', $_POST['csrf'])) {
     $count = $purgeService->purgeOldPolls();
-    $message = _('Purged:') . ' ' . $count;
+    $message = __('Admin', 'Purged:') . ' ' . $count;
 }
 
 // Assign data to template

admin/purge.php

@@ -39,7 +39,7 @@ function send($to, $subject, $body, $param = '') {
             $headers .= "Auto-Submitted:auto-generated\n";
             $headers .= 'Return-Path: <>';
 
-            $body = html_entity_decode($body, ENT_QUOTES, 'UTF-8') . _("\n--\n\n« La route est longue, mais la voie est libre… »\nFramasoft ne vit que par vos dons (déductibles des impôts).\nMerci d'avance pour votre soutien http://soutenir.framasoft.org.");
+            $body = html_entity_decode($body, ENT_QUOTES, 'UTF-8') . __('Mail', "\n--\n\n« La route est longue, mais la voie est libre… »\nFramasoft ne vit que par vos dons (déductibles des impôts).\nMerci d'avance pour votre soutien http://soutenir.framasoft.org.");
 
             mail($to, $subject, $body, $headers, $param);
         }

app/classes/Framadate/Services/MailService.php

@@ -33,8 +33,6 @@ Here are the main files and directories you need to know in order to develop on
     * La page de création (2/2) pour un sondage pour déterminer une date
 * crete_classic_poll.php
     * La page de création (2/2) pour un sondage sur un sujet quelconque
-* creation_sondage.php
-    * Le fichier qui récupérent les informations des pages précédentes pour procéder à l'insertion du nouveau sondage dans la base PostgreSQL
 * bandeaux.php
     * Le fichier contenant tous les bandeaux des pages PHP de l'application
 * favicon.ico

creation_sondage.php

@@ -48,7 +48,7 @@
 }
 
 if (!$poll) {
-    $smarty->assign('error', _('This poll doesn\'t exist !'));
+    $smarty->assign('error', __('Error', 'This poll doesn\'t exist !'));
     $smarty->display('error.tpl');
     exit;
 }
@@ -86,13 +86,13 @@
     foreach ($choices as $choice) {
         switch ($choice) {
             case 0:
-                $text = _('No');
+                $text = __('Generic', 'No');
                 break;
             case 1:
-                $text = _('Ifneedbe');
+                $text = __('Generic', 'Ifneedbe');
                 break;
             case 2:
-                $text = _('Yes');
+                $text = __('Generic', 'Yes');
                 break;
             default:
                 $text = 'unkown';

doc/TREEVIEW.md

@@ -148,7 +148,8 @@
         "POLL_LOCKED_WARNING": "Die Administration gesperrt diese Umfrage. Bewertungen und Kommentare werden eingefroren, es ist nicht mehr möglich, teilzunehmen",
         "The poll is expired, it will be deleted soon.": "Die Umfrage ist abgelaufen, es wird bald gelöscht werden.",
         "Deletion date:": "Löschdatum:",
-        "Your vote has been registered successfully, but be careful: regarding this poll options, you need to keep this personal link to edit your own vote:": "DE_Votre vote a bien été pris en compte, mais faites attention : ce sondage n'autorise l'édition de votre vote qu'avec le lien personnalisé suivant ; conservez le précieusement ! "
+        "Your vote has been registered successfully, but be careful: regarding this poll options, you need to keep this personal link to edit your own vote:": "DE_Votre vote a bien été pris en compte, mais faites attention : ce sondage n'autorise l'édition de votre vote qu'avec le lien personnalisé suivant ; conservez le précieusement ! ",
+        "Update vote succeeded": "Update Abstimmung gelungen"
     },
     "adminstuds": {
         "As poll administrator, you can change all the lines of this poll with this button": "Als Administrator der Umfrage, können Sie alle Zeilen der Umfrage über diesen Button ändern",
@@ -244,6 +245,7 @@
     },
     "Admin": {
         "Back to administration": "Zurück zur Verwaltung",
+        "Administration": "Verwaltung",
         "Polls": "Umfragen",
         "Migration": "Migration",
         "Purge": "Säuberung",
@@ -267,6 +269,7 @@
         "Failed:": "fehlgeschlagen:",
         "Skipped:": "übersprungene:",
         "Pages:": "Seiten:",
+        "Purged:": "gespült :",
         "Confirm removal of the poll": "Bestätigen Sie die Löschung ihrer Umfrage",
         "polls in the database at this time": "Umfragen derzeit in der Datenbank",
         "Purge the polls": "TRANSLATE_ Purge the polls"
@@ -290,21 +293,25 @@
     "Error": {
         "Error!": "Fehler!",
         "Enter a title": "Titel eingeben",
+        "Something is going wrong...": "Etwas falsch läuft...",
         "Something is wrong with the format": "Something is wrong with the format",
         "Enter an email address": "Sie müssen eine E-Mail-Adresse eingeben",
         "The address is not correct! You should enter a valid email address (like [email protected]) in order to receive the link to your poll.": "Die Adresse ist nicht korrekt! Sie sollten eine funktionierende E-Mail-Adresse angeben, um den Link zu ihrer Umfrage zu erhalten",
+        "There is a problem with your choices": "Es gibt ein Problem mit der Auswahl",
         "You haven't filled the first section of the poll creation.": "Sie haben den ersten Teil der Umfrageerstellung nicht ausgefüllt.",
         "Javascript is disabled on your browser. Its activation is required to create a poll.": "Javascript ist in Ihrem Browser deaktiviert. Seine Aktivierung ist erforderlich, um eine Umfrage zu erstellen.",
         "Cookies are disabled on your browser. Theirs activation is required to create a poll.": "Cookies werden auf Ihrem Browser deaktiviert. Deren Aktivierung ist erforderlich, um eine Umfrage zu erstellen.",
         "This poll doesn't exist !": "Diese Umfrage existiert nicht!",
         "Enter a name": "Geben Sie einen Namen ein",
+        "Name is incorrect": "Name ist falsch",
         "The name you've chosen already exist in this poll!": "Der von Ihnen eingegebenen Name existiert bereits in dieser Umfrage",
         "Enter a name and a comment!": "Geben Sie einen Namen und ein Kommentar ein!",
         "Failed to insert the comment!": "Einfügen des Kommentars gescheitert!",
         "Framadate is not properly installed, please check the \"INSTALL\" to setup the database before continuing.": "Framadate ist nicht richtig installiert, überprüfen Sie bitte die Schaltfläche \"INSTALL\", um das Setup der Datenbank, bevor Sie fortfahren.",
         "Failed to save poll": "Fehlgeschlagen Umfrage sparen",
         "Update vote failed": "Update vote failed",
         "Adding vote failed": "Adding vote failed",
+        "Comment failed": "Kommentar gescheitert",
         "You can't create a poll with hidden results with the following edition option:": "DE_Vous ne pouvez pas créer de sondage avec résulats cachés avec les options d'éditions suivantes : "
     }
-}
+}

exportcsv.php

@@ -85,7 +85,6 @@
     "Remove all the votes": "Remove all the votes",
     "Print": "Print",
     "Export to CSV": "Export to CSV",
-    "Remove the poll": "Remove the poll",
     "Title": "Title of the poll",
     "Edit the title": "Edit the title",
     "Save the new title": "Save the new title",
@@ -149,7 +148,8 @@
     "POLL_LOCKED_WARNING": "The administration locked this poll. Votes and comments are frozen, it is no longer possible to participate",
     "The poll is expired, it will be deleted soon.":  "The poll is expired, it will be deleted soon.",
     "Deletion date:": "Deletion date:",
-    "Your vote has been registered successfully, but be careful: regarding this poll options, you need to keep this personal link to edit your own vote:": "Your vote has been registered successfully, but be careful: regarding this poll options, you need to keep this personal link to edit your own vote."
+    "Your vote has been registered successfully, but be careful: regarding this poll options, you need to keep this personal link to edit your own vote:": "Your vote has been registered successfully, but be careful: regarding this poll options, you need to keep this personal link to edit your own vote.",
+    "Update vote succeeded": "Update vote succeeded"
   },
   "adminstuds": {
     "As poll administrator, you can change all the lines of this poll with this button": "As poll administrator, you can change all the lines of this poll with this button",
@@ -245,6 +245,7 @@
   },
   "Admin": {
     "Back to administration": "Back to administration",
+    "Administration": "Administration",
     "Polls": "Polls",
     "Migration": "Migration",
     "Purge": "Purge",
@@ -268,6 +269,7 @@
     "Failed:": "Failed:",
     "Skipped:": "Skipped:",
     "Pages:": "Pages:",
+    "Purged:": "Purged:",
     "Confirm removal of the poll": "Confirm removal of the poll ",
     "polls in the database at this time": "polls in the database at this time",
     "Purge the polls": "Purge the polls"
@@ -291,21 +293,25 @@
   "Error": {
     "Error!": "Error!",
     "Enter a title": "Enter a title",
+    "Something is going wrong...": "Something is going wrong...",
     "Something is wrong with the format": "Something is wrong with the format",
     "Enter an email address": "Enter an email address",
     "The address is not correct! You should enter a valid email address (like [email protected]) in order to receive the link to your poll.": "The address is not correct! You should enter a valid email address (like [email protected]) in order to receive the link to your poll.",
+    "There is a problem with your choices": "There is a problem with your choices",
     "You haven't filled the first section of the poll creation.": "You haven't filled the first section of the poll creation.",
     "Javascript is disabled on your browser. Its activation is required to create a poll.": "Javascript is disabled on your browser. Its activation is required to create a poll.",
     "Cookies are disabled on your browser. Theirs activation is required to create a poll.": "Cookies are disabled on your browser. Theirs activation is required to create a poll.",
     "This poll doesn't exist !": "This poll doesn't exist !",
     "Enter a name": "Enter a name",
+    "Name is incorrect": "Name is incorrect",
     "The name you've chosen already exist in this poll!": "The name you've chosen already exist in this poll!",
     "Enter a name and a comment!": "Enter a name and a comment!",
     "Failed to insert the comment!": "Failed to insert the comment!",
     "Framadate is not properly installed, please check the \"INSTALL\" to setup the database before continuing.": "Framadate is not properly installed, please check the 'INSTALL' to setup the database before continuing.",
     "Failed to save poll": "Failed to save poll",
     "Update vote failed": "Update vote failed",
     "Adding vote failed": "Adding vote failed",
+    "Comment failed": "Comment failed",
     "You can't create a poll with hidden results with the following edition option:": "You can't create a poll with hidden results with the following edition option: "
   }
-}
+}