From e720abf8754bdb0ea770d3355a86103b0063e0d1 Mon Sep 17 00:00:00 2001
From: evilbunny2008 <34211365+evilbunny2008@users.noreply.github.com>
Date: Wed, 21 Apr 2021 22:38:39 +1000
Subject: [PATCH] More localised forecasts

---
 .../com/odiousapps/weewxweather/MainActivity.java     | 11 ++++++++++-
 .../main/java/com/odiousapps/weewxweather/Stats.java  |  2 +-
 .../java/com/odiousapps/weewxweather/Weather.java     |  4 ++--
 app/src/main/res/values-it/strings.xml                |  6 ++++++
 app/src/main/res/values-nl/strings.xml                |  6 ++++++
 app/src/main/res/values/strings.xml                   |  6 ++++++
 6 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/odiousapps/weewxweather/MainActivity.java b/app/src/main/java/com/odiousapps/weewxweather/MainActivity.java
index e3a1c08..afaae96 100644
--- a/app/src/main/java/com/odiousapps/weewxweather/MainActivity.java
+++ b/app/src/main/java/com/odiousapps/weewxweather/MainActivity.java
@@ -73,7 +73,7 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte
 	private ProgressDialog dialog;
 
 	private static int pos;
-	private static final String[] paths = {"Manual Updates", "Every 5 Minutes", "Every 10 Minutes", "Every 15 Minutes", "Every 30 Minutes", "Every Hour"};
+	private static String[] paths;
 
 	@SuppressLint("WrongConstant")
 	@Override
@@ -158,6 +158,15 @@ private void showUpdateAvailable()
 
     private void doSettings()
     {
+    	paths = new String[]
+	    {
+            getString(R.string.manual_update),
+		    getString(R.string.every_5_minutes),
+		    getString(R.string.every_10_minutes),
+		    getString(R.string.every_15_minutes),
+		    getString(R.string.every_30_minutes),
+		    getString(R.string.every_hour),
+	    };
 	    ArrayAdapter<String> adapter = new ArrayAdapter<>(common.context, R.layout.spinner_layout, paths);
 	    adapter.setDropDownViewResource(R.layout.spinner_layout);
 	    s1.setAdapter(adapter);
diff --git a/app/src/main/java/com/odiousapps/weewxweather/Stats.java b/app/src/main/java/com/odiousapps/weewxweather/Stats.java
index 08f9d9b..27b04df 100644
--- a/app/src/main/java/com/odiousapps/weewxweather/Stats.java
+++ b/app/src/main/java/com/odiousapps/weewxweather/Stats.java
@@ -554,7 +554,7 @@ public void run()
 			    if (bits.length > 157 && !bits[157].equals(""))
 			    {
 				    sb.append("<span style='font-size:18pt;font-weight:bold;'>");
-
+					sb.append(common.context.getString(R.string.all_time_stats));
 				    sb.append("</span>");
 				    sb.append("<table style='width:100%;border:0px;'>");
 
diff --git a/app/src/main/java/com/odiousapps/weewxweather/Weather.java b/app/src/main/java/com/odiousapps/weewxweather/Weather.java
index 315a787..f46cd48 100644
--- a/app/src/main/java/com/odiousapps/weewxweather/Weather.java
+++ b/app/src/main/java/com/odiousapps/weewxweather/Weather.java
@@ -131,9 +131,9 @@ public boolean onConsoleMessage(ConsoleMessage cm)
 			    "<td style='text-align:right;'>" + bits[6] + bits[64] + "</td><td><i style='font-size:" + iw + "px;' class='wi wi-humidity'></i></td></tr>";
 	    sb.append(stmp);
 
-	    String rain = bits[20] + bits[62] + " since mn";
+	    String rain = bits[20] + bits[62] + " " + common.context.getString(R.string.since) + " mn";
 	    if(bits.length > 160 && !bits[160].equals(""))
-		    rain = bits[158] + bits[62] + " since " + bits[160];
+		    rain = bits[158] + bits[62] + " " + common.context.getString(R.string.since) + " " + bits[160];
 
 	    stmp = "<tr><td><i style='font-size:" + iw + "px;' class='wi wi-umbrella'></i></td><td>" + rain + "</td>" +
 			    "<td style='text-align:right;'>" + bits[12] + bits[60] + "</td><td><i style='font-size:" + round(iw * 1.4) + "px;' class='wi wi-raindrop'></i></td></tr>";
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index fc94b15..2483f7f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -52,4 +52,10 @@
     <string name="all_time_stats">Assoluti</string>
     <string name="since">dal</string>
     <string name="before">prima</string>
+    <string name="manual_update">Aggiorna manualmente</string>
+    <string name="every_5_minutes">Ogni 5 Minuti</string>
+    <string name="every_10_minutes">Ogni 10 Minuti</string>
+    <string name="every_15_minutes">Ogni 15 Minuti</string>
+    <string name="every_30_minutes">Ogni 30 Minuti</string>
+    <string name="every_hour">Ogni ora</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index b7d1f79..616b507 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -52,4 +52,10 @@
     <string name="all_time_stats">All Time Statistics</string>
     <string name="since">since</string>
     <string name="before">before</string>
+    <string name="manual_update">Manual Updates</string>
+    <string name="every_5_minutes">Every 5 Minutes</string>
+    <string name="every_10_minutes">Every 10 Minutes</string>
+    <string name="every_15_minutes">Every 15 Minutes</string>
+    <string name="every_30_minutes">Every 30 Minutes</string>
+    <string name="every_hour">Every Hour</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 59f5d15..1e205f7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -52,4 +52,10 @@
     <string name="all_time_stats">All Time Statistics</string>
     <string name="since">since</string>
     <string name="before">before</string>
+    <string name="manual_update">Manual Updates</string>
+    <string name="every_5_minutes">Every 5 Minutes</string>
+    <string name="every_10_minutes">Every 10 Minutes</string>
+    <string name="every_15_minutes">Every 15 Minutes</string>
+    <string name="every_30_minutes">Every 30 Minutes</string>
+    <string name="every_hour">Every Hour</string>
 </resources>