Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Italian language added #1449

Closed
wants to merge 7 commits into from
Closed

Italian language added #1449

wants to merge 7 commits into from

Conversation

gtortone
Copy link
Contributor

Hi,
in this PR I added support for italian language, but I skip to translate words
used in JSON (MQTT) messages to avoid that changing language can break
HA configuration;

in principle these words (e.g. temperature, humidity, etc.) should be used only in
one language (e.g. English) but translated in Sonoff-Tasmota web interface; a possible
solution could be to define a separate label for this purpose...

@arendst
Copy link
Owner

arendst commented Dec 28, 2017

Agree. I will make different defines for the JSON messages in due time. Until then I will add your translation to the list.

arendst added a commit that referenced this pull request Dec 28, 2017
@arendst
v5.10.0e
20619ac 
5.10.0e
 * Add Italian language file (#1449)
 * Fix Wemo Emulation once
again closest to issue (#1357)
arendst added a commit that referenced this pull request Dec 29, 2017
@arendst
v5.10.0f
5639b6d 
5.10.0f
 * Differentiate between JSON text defines and other text
defines to allow for English JSON while using different locale (#1449)

* Fix display of build date and time in non-english locale (#1465)
@arendst
Copy link
Owner

arendst commented Dec 30, 2017

See #1449

@gtortone
Copy link
Contributor Author

Hi,
I added new translations keeping JSON label in English, but I realized that some labels
are still used in JSON message (not in telemetry) and they are not separated by web interface labels.

e.g. D_ABORTED, D_ACTIVE, D_APPENDED, D_BLINK, D_BLINKOFF....

@arendst
Copy link
Owner

arendst commented Dec 31, 2017

You're right regarding D_ABORTED etc.

Considering the current POLL result I guess most defines will stay in English and only the non-JSON ones will be translated.

arendst added a commit that referenced this pull request Jan 5, 2018
@arendst
v5.10.0i - Fixes and rearrangements
349230d 
5.10.0i
 * Add device function pointers
 * Moved Command and JSON
English language defines to one file (i18n.h)
 * Update it-IT.h language
file (#1449)
 * Fix Wemo and Hue emulation by adding M-Search response
delay (#1486)
@gtortone
Copy link
Contributor Author

gtortone commented Jan 6, 2018

I realized that "Logging Parameters" web page displays the third option as "Syslog level" but the word
"Syslog" is obtained in webserver.ino (line 856) using D_SYS and "log level"... but in italian this does
not work fine because "log level" (English) translate as "livello di log" (Italian) and concatenation of
D_SYS with "livello di log" is "Syslivello di log" that is a nonsense...

I suppose this is related to Syslog verbosity and in this case D_SYS must be always in English and
its value could be fixed as "Syslog"... if this is the case the line

page.replace(F("{b0"), F(D_SYS));

can be replaced with:

page.replace(F("{b0"), F(D_SYS " "));

@arendst
Copy link
Owner

arendst commented Jan 7, 2018

I'll change D_SYS into D_SYS_LOG_LEVEL, D_WEB into D_WEB_LOG_LEVEL and D_SERIAL into D_SERIAL_LOG_LEVEL an update handling in webserver accordingly. This should solve future translations too at the cost of some code space.

arendst added a commit that referenced this pull request Jan 7, 2018
@arendst
v5.11.0
9c9a80f 
5.11.0 20180107
 * Minor webpage HTML optimizations (#1358)
 * Updated
German translation (#1438)
 * Change Sonoff Pow Energy MQTT data message
and consolidate Status 8 into Status 10
 * Change ADS1115 default
voltage range from +/-2V to +/-6V (#1289)
 * Change text to Active for 3
minutes (#1364)
 * Change Wemo SetBinaryState to distinguish from
GetBinaryState (#1357)
 * Change output of HTTP command to valid JSON
and Array only (#1363)
 * Removed all MQTT, JSON and Command language
defines from locale files and set fixed to English (#1473)
 * Renamed
commands Color2,3,4 to Color3,4,5
 * Fix BME280 calculation (#1051)
 *
Fix Sonoff Bridge missed learned key if learned data contains 0x55 (End
of Transmission) flag (#1095, #1294)
 * Fix PWM initialization in
Dimmer/Color mode (#1321)
 * Fix Wemo Emulation (#1357)
 * Fix display
of build date and time in non-english locale (#1465)
 * Fix Wemo and Hue
emulation by adding M-Search response delay (#1486)
 * Add libraries
Adafruit_BME680-1.0.5, Adafruit_Sensor-1.0.2.02, TasmotaSerial-1.0.0 and
TSL2561-Arduino-Library
 * Add command Color2 to set color while keeping
same dimmer value
 * Add device function pointers
 * Add support for
SenseAir S8 CO2 sensor
 * Add color led signal to Carbon Dioxide (CO2)
sensors using defines CO2_LOW and CO2_HIGH in user_config.h
 * Add
support for Domoticz Air Quality sensor to be used by MH-Z19(B) and
SenseAir sensors
 * Add support for PZEM004T energy sensor
 * Add
support for iTead SI7021 temperature and humidity sensor by
consolidating DHT22 into AM2301 and using former DHT22 as SI7021 (#735)

* Add support for BME680 using adafruit libraries (#1212)
 * Add support
for MH-Z19(B) CO2 sensor (#561, #1248)
 * Add multipress support and
more user configurable GPIO to Sonoff Dual R2 (#1291)
 * Add support for
TSL2561 using adafruit library (#661, #1311)
 * Add support for SHT3x
(#1314)
 * Add support for Arilux LC06 (#1414)
 * Add Italian language
file (#1449)
 * Add 2nd Gen Alexa support to Wemo emulation discovery
(#1357, #1450)
 * Add define for additional number of WS2812 schemes
(#1463)
joecotton pushed a commit to joecotton/Sonoff-Tasmota that referenced this pull request Jan 8, 2018
@arendst @joecotton
v5.11.0
6de4618 
5.11.0 20180107
 * Minor webpage HTML optimizations (arendst#1358)
 * Updated
German translation (arendst#1438)
 * Change Sonoff Pow Energy MQTT data message
and consolidate Status 8 into Status 10
 * Change ADS1115 default
voltage range from +/-2V to +/-6V (arendst#1289)
 * Change text to Active for 3
minutes (arendst#1364)
 * Change Wemo SetBinaryState to distinguish from
GetBinaryState (arendst#1357)
 * Change output of HTTP command to valid JSON
and Array only (arendst#1363)
 * Removed all MQTT, JSON and Command language
defines from locale files and set fixed to English (arendst#1473)
 * Renamed
commands Color2,3,4 to Color3,4,5
 * Fix BME280 calculation (arendst#1051)
 *
Fix Sonoff Bridge missed learned key if learned data contains 0x55 (End
of Transmission) flag (arendst#1095, arendst#1294)
 * Fix PWM initialization in
Dimmer/Color mode (arendst#1321)
 * Fix Wemo Emulation (arendst#1357)
 * Fix display
of build date and time in non-english locale (arendst#1465)
 * Fix Wemo and Hue
emulation by adding M-Search response delay (arendst#1486)
 * Add libraries
Adafruit_BME680-1.0.5, Adafruit_Sensor-1.0.2.02, TasmotaSerial-1.0.0 and
TSL2561-Arduino-Library
 * Add command Color2 to set color while keeping
same dimmer value
 * Add device function pointers
 * Add support for
SenseAir S8 CO2 sensor
 * Add color led signal to Carbon Dioxide (CO2)
sensors using defines CO2_LOW and CO2_HIGH in user_config.h
 * Add
support for Domoticz Air Quality sensor to be used by MH-Z19(B) and
SenseAir sensors
 * Add support for PZEM004T energy sensor
 * Add
support for iTead SI7021 temperature and humidity sensor by
consolidating DHT22 into AM2301 and using former DHT22 as SI7021 (arendst#735)

* Add support for BME680 using adafruit libraries (arendst#1212)
 * Add support
for MH-Z19(B) CO2 sensor (arendst#561, arendst#1248)
 * Add multipress support and
more user configurable GPIO to Sonoff Dual R2 (arendst#1291)
 * Add support for
TSL2561 using adafruit library (arendst#661, arendst#1311)
 * Add support for SHT3x
(arendst#1314)
 * Add support for Arilux LC06 (arendst#1414)
 * Add Italian language
file (arendst#1449)
 * Add 2nd Gen Alexa support to Wemo emulation discovery
(arendst#1357, arendst#1450)
 * Add define for additional number of WS2812 schemes
(arendst#1463)
@arendst arendst closed this Jan 10, 2018
curzon01 pushed a commit to curzon01/Tasmota that referenced this pull request Sep 6, 2018
@arendst
v5.10.0e
fa5ad27 
5.10.0e
 * Add Italian language file (arendst#1449)
 * Fix Wemo Emulation once
again closest to issue (arendst#1357)
curzon01 pushed a commit to curzon01/Tasmota that referenced this pull request Sep 6, 2018
@arendst
v5.10.0f
c7d1fcd 
5.10.0f
 * Differentiate between JSON text defines and other text
defines to allow for English JSON while using different locale (arendst#1449)

* Fix display of build date and time in non-english locale (arendst#1465)
curzon01 pushed a commit to curzon01/Tasmota that referenced this pull request Sep 6, 2018
@arendst
v5.10.0i - Fixes and rearrangements
882c171 
5.10.0i
 * Add device function pointers
 * Moved Command and JSON
English language defines to one file (i18n.h)
 * Update it-IT.h language
file (arendst#1449)
 * Fix Wemo and Hue emulation by adding M-Search response
delay (arendst#1486)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@gtortone @arendst