From f82537aded9088ff7ebbbeb646a1cbeada97a618 Mon Sep 17 00:00:00 2001
From: yattoz <12408848+yattoz@users.noreply.github.com>
Date: Mon, 30 Dec 2019 14:54:50 +0100
Subject: [PATCH] moved hard-coded string to resources. Translated app to
 French.

---
 .../java/fr/forum_thalie/tsumugi/Values.kt    |  6 +-
 .../forum_thalie/tsumugi/planning/Planning.kt |  3 +-
 .../ui/nowplaying/NowPlayingFragment.kt       |  2 +-
 app/src/main/res/values-fr/strings.xml        | 68 +++++++++++++++++++
 app/src/main/res/values/strings.xml           | 16 ++++-
 app/src/main/res/xml/alarm_preferences.xml    |  8 +--
 .../main/res/xml/customize_preferences.xml    |  6 +-
 app/src/main/res/xml/preferences.xml          |  9 ++-
 app/src/main/res/xml/sleep_preference.xml     |  4 +-
 9 files changed, 103 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/res/values-fr/strings.xml

diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/Values.kt b/app/src/main/java/fr/forum_thalie/tsumugi/Values.kt
index 85e49de..4a77e03 100644
--- a/app/src/main/java/fr/forum_thalie/tsumugi/Values.kt
+++ b/app/src/main/java/fr/forum_thalie/tsumugi/Values.kt
@@ -5,10 +5,12 @@ import android.content.res.ColorStateList
 import kotlin.collections.ArrayList
 
 const val tag = "fr.forum_thalie.tsumugi"
-const val noConnectionValue = "Arrêté."
-const val streamDownValue = "Tsumugi est HS !"
+const val noConnectionValue = "—"
+const val streamDownValue = "Tsumugi est HS !" // we don't want this value to be displaed in the "last played" screen.
 val weekdaysArray : Array<String> = arrayOf( "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi", "Dimanche")
 
+// Below this line is only automatically programmed values. Unless your week does not start with Monday, you don't need to change this.
+
 val weekdays = ArrayList<String>().apply { weekdaysArray.forEach { add(it) } }
 val weekdaysSundayFirst = ArrayList<String>().apply {
     weekdays.forEach {
diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/planning/Planning.kt b/app/src/main/java/fr/forum_thalie/tsumugi/planning/Planning.kt
index e9300c3..6c4121b 100644
--- a/app/src/main/java/fr/forum_thalie/tsumugi/planning/Planning.kt
+++ b/app/src/main/java/fr/forum_thalie/tsumugi/planning/Planning.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import androidx.lifecycle.MutableLiveData
 import fr.forum_thalie.tsumugi.Async
 import fr.forum_thalie.tsumugi.R
+import fr.forum_thalie.tsumugi.noConnectionValue
 import fr.forum_thalie.tsumugi.weekdays
 import org.json.JSONObject
 import java.io.IOException
@@ -26,7 +27,7 @@ class Planning {
             if (it.isCurrent())
                 return it.title
         }
-        return regularProgramme ?: "—"
+        return regularProgramme ?: noConnectionValue
     }
 
     fun checkProgramme()
diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingFragment.kt
index d7a26a6..73294b2 100644
--- a/app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingFragment.kt
+++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/nowplaying/NowPlayingFragment.kt
@@ -162,7 +162,7 @@ class NowPlayingFragment : Fragment() {
             if (sleepAtMillis != null)
             {
                 val duration = ((sleepAtMillis - System.currentTimeMillis()).toFloat() / (60f * 1000f) + 1).toInt() // I put 1 + it because the division rounds to the lower integer. I'd like to display the round up, like it's usually done.
-                sleepInfoText.text = "Will close in $duration minute${if (duration > 1) "s" else ""}"
+                sleepInfoText.text = String.format(getString(R.string.willCloseIn), duration) // "Will close in $duration minute${if (duration > 1) "s" else ""}"
                 sleepInfoText.visibility = View.VISIBLE
             } else {
                 sleepInfoText.visibility = View.GONE
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
new file mode 100644
index 0000000..e44bafa
--- /dev/null
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,68 @@
+<resources>
+    <string name="app_name">Tsumugi</string>
+    <string name="title_nowplaying">Tsumugi</string>
+    <string name="title_queue_lp">Titres</string>
+    <string name="title_chat">Chat</string>
+    <string name="title_news">Actus</string>
+    <string name="title_programme">Planning</string>
+
+    <string name="now_playing_notification_title_template">Maintenant: %1$s</string>
+
+    <string name="MEDIA_ROOT_ID">radio_root_id</string>
+    <string name="STREAM_URL_RADIO">https://relay0.r-a-d.io/main.mp3</string>
+    <string name="STREAM_URL_TSUMUGI">https://radio.mahoro-net.org/streams/tsumugi</string>
+    <string name="STREAM_URL_RSTLSS">http://stream.radiosolution.fr/rstlss.mp3</string>
+
+    <string name="volume">Volume : </string>
+
+    <string name="up_next">Émission en cours :</string>
+    <string name="now_streaming">En cours</string>
+    <string name="error_webView">Erreur du chargement de WebView. Téléchargez Google Chrome sur le Play Store, ou activez le si vous l\'avez désactivé.</string>
+    <string name="action_settings">Paramètres</string>
+    <string name="action_bug_submit">Reporter un bug (GitHub)</string>
+    <string name="github_url_new_issue">https://github.com/yattoz/Tsumugi-app/issues/</string>
+
+    <string name="nowPlayingNotificationChannel">Tsumugi Stream Service</string>
+    <string name="nowPlayingChannelId">fr.forum_thalie.tsumugi.PLAYER_SERVICE</string>
+
+    <string name="snackbarPersistent">Restent visibles, peuvent être fermées avec un bouton \"OK\" ou en glissant.</string>
+    <string name="snackbarNonPersistent">Disparaissent après quelques instants</string>
+    <string name="every_day">Tous les jours</string>
+    <string name="working_days">Semaine ouvrée</string>
+    <string name="song_to_clipboard">Titre copié dans le presse-papier !</string>
+    <string name="listeners">Auditeurs</string>
+    <string name="r_a_dio_icon">Icone de la radio</string>
+    <string name="split_layout">Divise l\'écran en 2 parties quand l\'appareil est à l\'horizontale</string>
+    <string name="not_split_layout">Garde la même disposition à l\'horizontale et à la verticale</string>
+    <string name="action_sleep">Minuterie avant fermeture</string>
+    <string name="dont_fetch_on_background">Désactiver</string>
+    <string name="restart_the_app">Vous devez redémarrer l\'application pour valider ces changements.</string>
+
+    <string name="action_alarm">Alarme</string>
+    <string name="sleep_fade_out_text">Une minute avant la fin de la minuterie, le volume va décroitre progressivement.</string>
+    <string name="disable">Désactiver</string>
+    <string name="website_url">https://tsumugi.forum-thalie.fr/</string>
+    <string name="rss_url">https://tsumugi.forum-thalie.fr/?feed=rss2</string>
+    <string name="planning_url">ADD SOME URL HERE</string>
+    <string name="select_one_day">Sélectionner au moins un jour.</string>
+    <string name="no_alarm_set">Pas d\'alarme</string>
+    <string name="next_alarm">Prochaine alarme :</string>
+    <string name="lp">Dernières titres</string>
+    <string name="programme">Planning</string>
+    <string name="regular_programme">Programme régulier</string>
+    <string name="useAlarmClock">Activer l\alarme</string>
+    <string name="setTime">Choisir l\'heure</string>
+    <string name="selectDaysOfWeek">Choisir les jours</string>
+    <string name="SetSnoozeDuration">Choisir le délai de snooze (minutes)</string>
+    <string name="volumeAtStartup">Volume au démarrage</string>
+    <string name="useHorizontalSplitLayout">Utiliser une disposition horizontale adaptée</string>
+    <string name="makeSnackbarsPersistent">Rendre les barres d\information persistantes</string>
+    <string name="setupAlarmClock">Configurer l\'alarme</string>
+    <string name="setSleepTimer">Configurer la minuterie avant extinction</string>
+    <string name="costumizeAppBehavior">Paramètres de l\'application</string>
+    <string name="submitABug">Reporter un bug</string>
+    <string name="sleepClosesApp">Minuterie avant fermeture de l\'application</string>
+    <string name="setSleepDuration">Choisir une durée (en minutes)</string>
+    <string name="willCloseIn">Extinction dans %1$d minutes</string>
+
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 083e151..a73448a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Tsumugi</string>
     <string name="title_nowplaying">Tsumugi</string>
     <string name="title_queue_lp">Songs</string>
@@ -50,5 +50,19 @@
     <string name="lp">Last played</string>
     <string name="programme">Planning</string>
     <string name="regular_programme">Programme régulier</string>
+    <string name="useAlarmClock">Use as alarm clock</string>
+    <string name="setTime">Set time</string>
+    <string name="selectDaysOfWeek">Select days of the week</string>
+    <string name="SetSnoozeDuration">Set snooze duration (minutes)</string>
+    <string name="volumeAtStartup">Volume at startup</string>
+    <string name="useHorizontalSplitLayout">Use horizontal split layout</string>
+    <string name="makeSnackbarsPersistent">Make Snackbars persistent</string>
+    <string name="setupAlarmClock">Set up alarm clock</string>
+    <string name="setSleepTimer">Set sleep timer</string>
+    <string name="costumizeAppBehavior">Customize app behavior</string>
+    <string name="submitABug">Submit a bug (opens GitHub in a web browser)</string>
+    <string name="sleepClosesApp">Sleep - close app after some time</string>
+    <string name="setSleepDuration">Set duration (minutes)</string>
+    <string name="willCloseIn">Will close in %1$d minutes</string>
 
 </resources>
diff --git a/app/src/main/res/xml/alarm_preferences.xml b/app/src/main/res/xml/alarm_preferences.xml
index 40b231e..625ee4c 100644
--- a/app/src/main/res/xml/alarm_preferences.xml
+++ b/app/src/main/res/xml/alarm_preferences.xml
@@ -6,7 +6,7 @@
     <SwitchPreferenceCompat
         app:key="isWakingUp"
         app:iconSpaceReserved="false"
-        app:title="Use as alarm clock"
+        app:title="@string/useAlarmClock"
         app:singleLineTitle="false"
         app:defaultValue="false"
         />
@@ -14,14 +14,14 @@
     <Preference
         app:key="timeSet"
         app:iconSpaceReserved="false"
-        app:title="Set time"
+        app:title="@string/setTime"
         app:singleLineTitle="false"
         app:defaultValue="false"/>
 
     <MultiSelectListPreference
         app:key="alarmDays"
         app:iconSpaceReserved="false"
-        app:title="Select days of the week"
+        app:title="@string/selectDaysOfWeek"
         app:singleLineTitle="false"
 
         />
@@ -29,7 +29,7 @@
     <ListPreference
         app:key="snoozeDuration"
         app:iconSpaceReserved="false"
-        android:title="Set snooze duration (minutes)"
+        android:title="@string/SetSnoozeDuration"
         app:singleLineTitle="false"
         android:entries="@array/snoozeValues"
         android:entryValues="@array/snoozeValues"
diff --git a/app/src/main/res/xml/customize_preferences.xml b/app/src/main/res/xml/customize_preferences.xml
index 3d9aeb3..b25496b 100644
--- a/app/src/main/res/xml/customize_preferences.xml
+++ b/app/src/main/res/xml/customize_preferences.xml
@@ -5,7 +5,7 @@
     <SeekBarPreference
         app:key="volume"
         app:iconSpaceReserved="false"
-        app:title="Volume at startup"
+        app:title="@string/volumeAtStartup"
         app:singleLineTitle="false"
         app:min="0"
         android:max="100"
@@ -16,7 +16,7 @@
     <SwitchPreferenceCompat
         app:key="splitLayout"
         app:iconSpaceReserved="false"
-        app:title="Use horizontal split layout"
+        app:title="@string/useHorizontalSplitLayout"
         app:singleLineTitle="false"
         app:defaultValue="true"
         />
@@ -24,7 +24,7 @@
     <SwitchPreferenceCompat
         app:key="snackbarPersistent"
         app:iconSpaceReserved="false"
-        app:title="Make Snackbars persistent"
+        app:title="@string/makeSnackbarsPersistent"
         app:singleLineTitle="false"
         app:defaultValue="false"
         />
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index b44de31..4b1e943 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,33 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     >
 
     <Preference
         app:icon="@drawable/ic_alarm"
         app:key="alarmScreen"
-        app:title="Set up alarm clock"
+        app:title="@string/setupAlarmClock"
         app:fragment="fr.forum_thalie.tsumugi.preferences.AlarmFragment"
         />
 
     <Preference
         app:icon="@drawable/ic_av_timer"
         app:key="sleepScreen"
-        app:title="Set sleep timer"
+        app:title="@string/setSleepTimer"
         app:fragment="fr.forum_thalie.tsumugi.preferences.SleepFragment"
         />
 
     <Preference
         app:icon="@drawable/ic_customize"
         app:key="CustomizeFragment"
-        app:title="Customize app behavior"
+        app:title="@string/costumizeAppBehavior"
         app:fragment="fr.forum_thalie.tsumugi.preferences.CustomizeFragment"
         />
 
     <Preference
         app:key="submitBug"
-        app:title="Submit a bug (opens GitHub in a web browser)"
+        app:title="@string/submitABug"
         app:icon="@drawable/ic_bug"
         />
 
diff --git a/app/src/main/res/xml/sleep_preference.xml b/app/src/main/res/xml/sleep_preference.xml
index 7604656..f64cca5 100644
--- a/app/src/main/res/xml/sleep_preference.xml
+++ b/app/src/main/res/xml/sleep_preference.xml
@@ -5,7 +5,7 @@
     <SwitchPreferenceCompat
         app:key="isSleeping"
         app:iconSpaceReserved="false"
-        app:title="Sleep - close app after some time"
+        app:title="@string/sleepClosesApp"
         app:singleLineTitle="false"
         app:defaultValue="false"
         />
@@ -13,7 +13,7 @@
     <EditTextPreference
         app:key="sleepDuration"
         app:iconSpaceReserved="false"
-        app:title="Set duration (minutes)"
+        app:title="@string/setSleepDuration"
         app:singleLineTitle="false"
         app:defaultValue="15"
         />