Merge pull request #179 from f-laurens/issue178

Correct/translate audio weather forecast configuration messages.
nabaztag2018 · Apr 23, 2021 · 8a8712d · 8a8712d
2 parents 7b760dd + 9138810
commit 8a8712d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 9 deletions.
diff --git a/nabweatherd/locale/fr_FR/LC_MESSAGES/django.po b/nabweatherd/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-12 16:52+0200\n"
+"POT-Creation-Date: 2021-04-21 14:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,12 +22,12 @@ msgid "Day"
 msgstr ""
 
 #: templates/nabweatherd/rfid-data.html:7
-#: templates/nabweatherd/settings.html:58
+#: templates/nabweatherd/settings.html:68
 msgid "Today"
 msgstr "Aujourd'hui"
 
 #: templates/nabweatherd/rfid-data.html:11
-#: templates/nabweatherd/settings.html:59
+#: templates/nabweatherd/settings.html:69
 msgid "Tomorrow"
 msgstr "Demain"
 
@@ -101,19 +101,39 @@ msgstr "Les deux"
 msgid "No visual animation"
 msgstr "Aucune information visuelle"
 
-#: templates/nabweatherd/settings.html:56
+#: templates/nabweatherd/settings.html:54
+msgid "Forecast frequency"
+msgstr "Fréquence de prévision"
+
+#: templates/nabweatherd/settings.html:57
+msgid "Every hour"
+msgstr "Toutes les heures"
+
+#: templates/nabweatherd/settings.html:58
+msgid "Every two to three hours"
+msgstr "Toutes les deux à trois heures"
+
+#: templates/nabweatherd/settings.html:59
+msgid "At wake up and at bedtime"
+msgstr "Au lever et au coucher"
+
+#: templates/nabweatherd/settings.html:60
+msgid "None"
+msgstr "Aucune"
+
+#: templates/nabweatherd/settings.html:66
 msgid "Forecast"
 msgstr "Prévision"
 
-#: templates/nabweatherd/settings.html:67
+#: templates/nabweatherd/settings.html:77
 msgid "Save"
 msgstr "Enregistrer"
 
-#: templates/nabweatherd/settings.html:68
+#: templates/nabweatherd/settings.html:78
 msgid "Reset"
 msgstr "Annuler"
 
-#: templates/nabweatherd/settings.html:127
+#: templates/nabweatherd/settings.html:137
 msgid "Unknown server error"
 msgstr "Erreur inconnue du serveur"
 

diff --git a/nabweatherd/templates/nabweatherd/settings.html b/nabweatherd/templates/nabweatherd/settings.html
@@ -51,13 +51,13 @@ <h5 class="card-title">{% trans "Weather" %}</h5>
       </div>
 
       <div class="form-group row">
-        <label for="weatherSelect" class="col-6 col-form-label">{% trans "Weather Frequency" %}</label>
+        <label for="weatherSelect" class="col-6 col-form-label">{% trans "Forecast frequency" %}</label>
         <div class="col-6">
           <select name="weather_frequency" id="weatherSelect">
             <option value="1"{% if config.weather_frequency == 1 %} selected{% endif %}>{% trans "Every hour"%}</option>
             <option value="2"{% if config.weather_frequency == 2 %} selected{% endif %}>{% trans "Every two to three hours"%}</option>
             <option value="3"{% if config.weather_frequency == 3 %} selected{% endif %}>{% trans "At wake up and at bedtime"%}</option>
-            <option value="0"{% if config.weather_frequency == 0 %} selected{% endif %}>{% trans "Disabled"%}</option>
+            <option value="0"{% if config.weather_frequency == 0 %} selected{% endif %}>{% trans "None"%}</option>
           </select>
         </div>
 	 </div>