v5.12.0b - Add Russian language

5.12.0b * Add Russian language file (#1909)
arendst · Feb 15, 2018 · b8d0169 · b8d0169
1 parent cdacd3e
commit b8d0169
Show file tree

Hide file tree

Showing 7 changed files with 463 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -62,7 +62,7 @@ The following devices are supported:
 - AriLux AL-LC01, AL-LC06 and AL-LC11 PWM LED controller
 - [Supla device - Espablo-inCan mod. for electrical Installation box](https://forum.supla.org/viewtopic.php?f=33&t=2188)
 - [Luani HVIO board](https://luani.de/projekte/esp8266-hvio/)
-- Wemos D1 mini and NodeMcu
+- Wemos D1 mini, NodeMcu and Ledunia
 
 ### License
 

diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino
@@ -4,6 +4,7 @@
  * Add optional usage of %d or %X suffices in MQTT topic to append chipid (#1871)
  * Add optional usage of %d or %04d in ota url to be replaced with chipid (#1871)
  * Add user configurable serial GPIOs to MagicHome and Arilux modules (#1887)
+ * Add Russian language file (#1909)
  *
  * 5.12.0a
  * Change platformio option sonoff-ds18x20 to sonoff-xxl enabling ds18x20 and all other sensors in one image

diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h
diff --git a/sonoff/settings.ino b/sonoff/settings.ino
@@ -154,6 +154,7 @@ extern "C" {
 
 extern "C" uint32_t _SPIFFS_end;
 
+// From libraries/EEPROM/EEPROM.cpp EEPROMClass
 #define SPIFFS_END          ((uint32_t)&_SPIFFS_end - 0x40200000) / SPI_FLASH_SEC_SIZE
 
 // Version 3.x config

diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino
@@ -2796,7 +2796,7 @@ void setup()
 
   blink_powersave = power;
 
-  snprintf_P(log_data, sizeof(log_data), PSTR(D_PROJECT " %s %s (" D_CMND_TOPIC " %s, " D_FALLBACK " %s, " D_CMND_GROUPTOPIC " %s) " D_VERSION " %s"),
+  snprintf_P(log_data, sizeof(log_data), PSTR(D_PROJECT " %s %s (" D_CMND_TOPIC " %s, " D_FALLBACK " %s, " D_CMND_GROUPTOPIC " %s) " D_VERSION " %s-" ARDUINO_ESP8266_RELEASE),
     PROJECT, Settings.friendlyname[0], mqtt_topic, mqtt_client, Settings.mqtt_grptopic, my_version);
   AddLog(LOG_LEVEL_INFO);
 #ifdef BE_MINIMAL

diff --git a/sonoff/user_config.h b/sonoff/user_config.h
@@ -36,6 +36,7 @@
 //#define MY_LANGUAGE            it-IT           // Italian in Italy
 //#define MY_LANGUAGE            nl-NL           // Dutch in the Netherlands
 //#define MY_LANGUAGE            pl-PL           // Polish in Poland
+//#define MY_LANGUAGE            ru-RU           // Russian in Russia
 //#define MY_LANGUAGE            zh-CN           // Chinese (Simplified) in China
 
 // -- Project -------------------------------------

diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino
@@ -866,7 +866,6 @@ void HandleMqttConfiguration()
   page += FPSTR(HTTP_FORM_MQTT);
   char str[sizeof(Settings.mqtt_client)];
   page.replace(F("{m0"), GetMqttClient(str, MQTT_CLIENT_ID, sizeof(Settings.mqtt_client)));
-//  page.replace(F("{m0"), str);
   page.replace(F("{m1"), Settings.mqtt_host);
   page.replace(F("{m2"), String(Settings.mqtt_port));
   page.replace(F("{m3"), Settings.mqtt_client);