Qrome - added the weather language support

printermonitor/OpenWeatherMapClient.cpp

@@ -23,8 +23,9 @@ SOFTWARE.
 
 #include "OpenWeatherMapClient.h"
 
-OpenWeatherMapClient::OpenWeatherMapClient(String ApiKey, int CityIDs[], int cityCount, boolean isMetric) {
+OpenWeatherMapClient::OpenWeatherMapClient(String ApiKey, int CityIDs[], int cityCount, boolean isMetric, String language) {
   updateCityIdList(CityIDs, cityCount);
+  updateLanguage(language);
   myApiKey = ApiKey;
   setMetric(isMetric);
 }
@@ -33,9 +34,16 @@ void OpenWeatherMapClient::updateWeatherApiKey(String ApiKey) {
   myApiKey = ApiKey;
 }
 
+void OpenWeatherMapClient::updateLanguage(String language) {
+  lang = language;
+  if (lang == "") {
+    lang = "en";
+  }
+}
+
 void OpenWeatherMapClient::updateWeather() {
   WiFiClient weatherClient;
-  String apiGetData = "GET /data/2.5/group?id=" + myCityIDs + "&units=" + units + "&cnt=1&APPID=" + myApiKey + " HTTP/1.1";
+  String apiGetData = "GET /data/2.5/group?id=" + myCityIDs + "&units=" + units + "&cnt=1&APPID=" + myApiKey + "&lang=" + lang + " HTTP/1.1";
 
   Serial.println("Getting Weather Data");
   Serial.println(apiGetData);

printermonitor/OpenWeatherMapClient.h

@@ -31,6 +31,7 @@ private:
   String myCityIDs = "";
   String myApiKey = "";
   String units = "";
+  String lang = "";
   
   const char* servername = "api.openweathermap.org";  // remote server we will connect to
   String result;
@@ -57,10 +58,11 @@ private:
   String roundValue(String value);
   
 public:
-  OpenWeatherMapClient(String ApiKey, int CityIDs[], int cityCount, boolean isMetric);
+  OpenWeatherMapClient(String ApiKey, int CityIDs[], int cityCount, boolean isMetric, String language);
   void updateWeather();
   void updateWeatherApiKey(String ApiKey);
   void updateCityIdList(int CityIDs[], int cityCount);
+  void updateLanguage(String language);
   void setMetric(boolean isMetric);
 
   String getWeatherResults();

printermonitor/Settings.h

@@ -68,6 +68,8 @@ String WeatherApiKey = ""; // Your API Key from http://openweathermap.org/
 // Default City Location (use http://openweathermap.org/find to find city ID)
 int CityIDs[] = { 5304391 }; //Only USE ONE for weather marquee
 boolean IS_METRIC = false; // false = Imperial and true = Metric
+// Languages: ar, bg, ca, cz, de, el, en, fa, fi, fr, gl, hr, hu, it, ja, kr, la, lt, mk, nl, pl, pt, ro, ru, se, sk, sl, es, tr, ua, vi, zh_cn, zh_tw
+String WeatherLanguage = "en";  //Default (en) English
 
 const int WEBSERVER_PORT = 80; // The port you can access this device on over HTTP
 const boolean WEBSERVER_ENABLED = true;  // Device will provide a web interface via http://[ip]:[port]/

printermonitor/printermonitor.ino

@@ -86,7 +86,7 @@ OctoPrintClient printerClient(OctoPrintApiKey, OctoPrintServer, OctoPrintPort, O
 int printerCount = 0;
 
 // Weather Client
-OpenWeatherMapClient weatherClient(WeatherApiKey, CityIDs, 1, IS_METRIC);
+OpenWeatherMapClient weatherClient(WeatherApiKey, CityIDs, 1, IS_METRIC, WeatherLanguage);
 
 //declairing prototypes
 void configModeCallback (WiFiManager *myWiFiManager);
@@ -129,9 +129,44 @@ String WEATHER_FORM = "<form class='w3-container' action='/updateweatherconfig'
                       "or full <a href='http://openweathermap.org/help/city_list.txt' target='_BLANK'>city list</a></label>"
                       "<input class='w3-input w3-border w3-margin-bottom' type='text' name='city1' value='%CITY1%' onkeypress='return isNumberKey(event)'></p>"
                       "<p><input name='metric' class='w3-check w3-margin-top' type='checkbox' %METRIC%> Use Metric (Celsius)</p>"
+                      "<p>Weather Language <select class='w3-option w3-padding' name='language'>%LANGUAGEOPTIONS%</select></p>"
                       "<button class='w3-button w3-block w3-grey w3-section w3-padding' type='submit'>Save</button></form>"
                       "<script>function isNumberKey(e){var h=e.which?e.which:event.keyCode;return!(h>31&&(h<48||h>57))}</script>";
 
+String LANG_OPTIONS = "<option>ar</option>"
+                      "<option>bg</option>"
+                      "<option>ca</option>"
+                      "<option>cz</option>"
+                      "<option>de</option>"
+                      "<option>el</option>"
+                      "<option>en</option>"
+                      "<option>fa</option>"
+                      "<option>fi</option>"
+                      "<option>fr</option>"
+                      "<option>gl</option>"
+                      "<option>hr</option>"
+                      "<option>hu</option>"
+                      "<option>it</option>"
+                      "<option>ja</option>"
+                      "<option>kr</option>"
+                      "<option>la</option>"
+                      "<option>lt</option>"
+                      "<option>mk</option>"
+                      "<option>nl</option>"
+                      "<option>pl</option>"
+                      "<option>pt</option>"
+                      "<option>ro</option>"
+                      "<option>ru</option>"
+                      "<option>se</option>"
+                      "<option>sk</option>"
+                      "<option>sl</option>"
+                      "<option>es</option>"
+                      "<option>tr</option>"
+                      "<option>ua</option>"
+                      "<option>vi</option>"
+                      "<option>zh_cn</option>"
+                      "<option>zh_tw</option>";
+
 String COLOR_THEMES = "<option>red</option>"
                       "<option>pink</option>"
                       "<option>purple</option>"
@@ -399,6 +434,7 @@ void handleUpdateWeather() {
   WeatherApiKey = server.arg("openWeatherMapApiKey");
   CityIDs[0] = server.arg("city1").toInt();
   IS_METRIC = server.hasArg("metric");
+  WeatherLanguage = server.arg("language");
   writeSettings();
   isClockOn = false; // this will force a check for the display
   checkDisplay();
@@ -483,7 +519,9 @@ void handleWeatherConfigure() {
     checked = "checked='checked'";
   }
   form.replace("%METRIC%", checked);
-
+  String options = LANG_OPTIONS;
+  options.replace(">"+String(WeatherLanguage)+"<", " selected>"+String(WeatherLanguage)+"<");
+  form.replace("%LANGUAGEOPTIONS%", options);
   server.sendContent(form);
   
   html = getFooter();
@@ -594,6 +632,7 @@ String getHeader(boolean refresh) {
 
   String html = "<!DOCTYPE HTML>";
   html += "<html><head><title>Printer Monitor</title><link rel='icon' href='data:;base64,='>";
+  html += "<meta charset='UTF-8'>";
   html += "<meta name='viewport' content='width=device-width, initial-scale=1'>";
   if (refresh) {
     html += "<meta http-equiv=\"refresh\" content=\"30\">";
@@ -964,6 +1003,7 @@ void writeSettings() {
     f.println("weatherKey=" + WeatherApiKey);
     f.println("CityID=" + String(CityIDs[0]));
     f.println("isMetric=" + String(IS_METRIC));
+    f.println("language=" + String(WeatherLanguage));
   }
   f.close();
   readSettings();
@@ -1068,10 +1108,16 @@ void readSettings() {
       IS_METRIC = line.substring(line.lastIndexOf("isMetric=") + 9).toInt();
       Serial.println("IS_METRIC=" + String(IS_METRIC));
     }
+    if (line.indexOf("language=") >= 0) {
+      WeatherLanguage = line.substring(line.lastIndexOf("language=") + 9);
+      WeatherLanguage.trim();
+      Serial.println("WeatherLanguage=" + WeatherLanguage);
+    }
   }
   fr.close();
   printerClient.updateOctoPrintClient(OctoPrintApiKey, OctoPrintServer, OctoPrintPort, OctoAuthUser, OctoAuthPass);
   weatherClient.updateWeatherApiKey(WeatherApiKey);
+  weatherClient.updateLanguage(WeatherLanguage);
   weatherClient.setMetric(IS_METRIC);
   weatherClient.updateCityIdList(CityIDs, 1);
   timeClient.setUtcOffset(UtcOffset);
@@ -1160,4 +1206,4 @@ void enableDisplay(boolean enable) {
     Serial.println("Display was turned OFF: " + timeClient.getFormattedTime());
     displayOffEpoch = lastEpoch;
   }
-}
+}