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.

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

Eliminate warnings and fix localization #1762

Merged
merged 3 commits into from
Dec 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
"LocalNotificationsManager.HighTemperature.title" = "Temperatur ist zu hoch!";
"LocalNotificationsManager.LowTemperature.title" = "Temperatur zu niedrig!";
"TagSettings.Alerts.Off" = "Aus";
"TagSettings.Alerts.Temperature.description" = "Warnung bei weniger als %0.f oder mehr als %0.f";
"TagSettings.Alerts.Temperature.description" = "Warnung bei weniger als %.0f oder mehr als %.0f";
"TagSettings.Label.alerts.text" = "Warnungen";
"TagSettings.backgroundImageLabel.text" = "Hintergrund bild";
"TagSettings.batteryVoltageTitleLabel.text" = "Batteriespannung";
Expand Down Expand Up @@ -558,8 +558,8 @@ Ihr RuuviTag-Sensor ist einsatzbereit!";
"TagSettings.Alert.SetHumidity.title" = "Feuchtigkeitsalarm einstellen";
"TagSettings.Alert.SetPressure.title" = "Druckalarm einstellen";
"TagSettings.Alert.SetRSSI.title" = "Signalstärkealarm einstellen";
"TagSettings.AlertSettings.Dialog.Min" = "Min (%0.f)";
"TagSettings.AlertSettings.Dialog.Max" = "Max (%0.f)";
"TagSettings.AlertSettings.Dialog.Min" = "Min (%.0f)";
"TagSettings.AlertSettings.Dialog.Max" = "Max (%.0f)";
"export_history" = "Verlauf exportieren (csv)";
"clear_view" = "Klare verlaufsansicht";
"day_1" = "1 Tag";
Expand All @@ -572,12 +572,12 @@ Ihr RuuviTag-Sensor ist einsatzbereit!";
"day_8" = "8 Tage";
"day_9" = "9 Tage";
"day_10" = "10 Tage";
"day_x" = "%0.f Tage";
"day_x" = "%.0f Tage";
"more" = "Mehr...";
"all" = "Alle";
"longer_history_title" = "Längere Geschichte";
"longer_history_message" = "Die Ruuvi Station Mobile App unterstützt maximal 10 Tage Historie. Ruuvi-Cloud-Abonnenten können mit der Web-App unter ruuvi.com/station (erfordert Ruuvi-Gateway-Router) bis zu 2 Jahre historische Daten anzeigen.";
"reading_history_x" = "Bluetooth-Sync: %0.f";
"reading_history_x" = "Bluetooth-Sync: %.0f";
"rssi_alert_description" = "Die Verwendung dieses Alarms setzt voraus, dass Sie in der App angemeldet sind und dass Sie den Sensor für sich beansprucht haben und dass er sich in der Reichweite des Ruuvi Gateway Routers befindet. iOS-Geräte können keine Informationen zur Signalstärke der vom Ruuvi-Sensor gesendeten Daten anzeigen, wenn der Sensor gekoppelt ist und Messungen im Hintergrund empfangen werden. Die Echtzeit-Bluetooth-Signalstärke wird in der App angezeigt, hat aber keinen Einfluss auf diesen Alarm.";
"bluetooth_download" = "Bluetooth-Download";
"bluetooth_download_description" = "Lokale Sensordaten können heruntergeladen werden, wenn Sie sich in Bluetooth-Reichweite befinden.";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ If you cannot see the Language option in the settings, make sure that you have a
"LocalNotificationsManager.HighTemperature.title" = "Temperature is too high!";
"LocalNotificationsManager.LowTemperature.title" = "Temperature is too low!";
"TagSettings.Alerts.Off" = "Off";
"TagSettings.Alerts.Temperature.description" = "Alert when less than %0.f or more than %0.f";
"TagSettings.Alerts.Temperature.description" = "Alert when less than %.0f or more than %.0f";
"TagSettings.Label.alerts.text" = "Alerts";
"TagSettings.backgroundImageLabel.text" = "Background image";
"TagSettings.batteryVoltageTitleLabel.text" = "Battery Voltage";
Expand Down Expand Up @@ -559,8 +559,8 @@ Your RuuviTag sensor is ready for use!";
"TagSettings.Alert.SetHumidity.title" = "Set humidity alert";
"TagSettings.Alert.SetPressure.title" = "Set pressure alert";
"TagSettings.Alert.SetRSSI.title" = "Set signal strength alert";
"TagSettings.AlertSettings.Dialog.Min" = "Min (%0.f)";
"TagSettings.AlertSettings.Dialog.Max" = "Max (%0.f)";
"TagSettings.AlertSettings.Dialog.Min" = "Min (%.0f)";
"TagSettings.AlertSettings.Dialog.Max" = "Max (%.0f)";
"export_history" = "Export history (csv)";
"clear_view" = "Clear history view";
"day_1" = "1 day";
Expand All @@ -573,12 +573,12 @@ Your RuuviTag sensor is ready for use!";
"day_8" = "8 days";
"day_9" = "9 days";
"day_10" = "10 days";
"day_x" = "%0.f days";
"day_x" = "%.0f days";
"more" = "More...";
"all" = "All";
"longer_history_title" = "Longer history";
"longer_history_message" = "Ruuvi Station mobile app supports maximum 10 days of history. Ruuvi Cloud subscribers are able to view up to 2 years of historical data using web app at ruuvi.com/station (requires Ruuvi Gateway router).";
"reading_history_x" = "Reading Bluetooth: %0.f";
"reading_history_x" = "Reading Bluetooth: %.0f";
"rssi_alert_description" = "Using this alert requires you to be signed in to the app, and that you have claimed the ownership of this sensor and it's in the range of Ruuvi Gateway router. iOS devices are unable to indicate signal strength information of received data sent by Ruuvi sensor when sensor is paired and measurements are being received in the background. Realtime Bluetooth signal strength is shown in the app but doesn't affect this alert.";
"bluetooth_download" = "Bluetooth download";
"bluetooth_download_description" = "Local sensor data can be downloaded, when you're within its Bluetooth range.";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ Mikäli et näe Kieli-valintaa asetuksissa, varmista, että sinulla on vähintä
"LocalNotificationsManager.HighTemperature.title" = "Lämpötila liian korkea!";
"LocalNotificationsManager.LowTemperature.title" = "Lämpötila liian alhainen!";
"TagSettings.Alerts.Off" = "Pois käytöstä";
"TagSettings.Alerts.Temperature.description" = "Hälytä, mikäli alle %0.f tai yli %0.f";
"TagSettings.Alerts.Temperature.description" = "Hälytä, mikäli alle %.0f tai yli %.0f";
"TagSettings.Label.alerts.text" = "Hälytykset";
"TagSettings.backgroundImageLabel.text" = "Taustakuva";
"TagSettings.batteryVoltageTitleLabel.text" = "Paristojännite";
Expand Down Expand Up @@ -559,8 +559,8 @@ RuuviTag on valmis käyttöön!";
"TagSettings.Alert.SetHumidity.title" = "Aseta kosteushälytys";
"TagSettings.Alert.SetPressure.title" = "Aseta painehälytys";
"TagSettings.Alert.SetRSSI.title" = "Aseta signaalinvoimakkuushälytys";
"TagSettings.AlertSettings.Dialog.Min" = "Min (%0.f)";
"TagSettings.AlertSettings.Dialog.Max" = "Max (%0.f)";
"TagSettings.AlertSettings.Dialog.Min" = "Min (%.0f)";
"TagSettings.AlertSettings.Dialog.Max" = "Max (%.0f)";
"export_history" = "Lataa historia (csv)";
"clear_view" = "Tyhjennä kaavionäkymä";
"day_1" = "1 päivä";
Expand All @@ -573,12 +573,12 @@ RuuviTag on valmis käyttöön!";
"day_8" = "8 päivää";
"day_9" = "9 päivää";
"day_10" = "10 päivää";
"day_x" = "%0.f päivää";
"day_x" = "%.0f päivää";
"more" = "Lisää...";
"all" = "Kaikki";
"longer_history_title" = "Pidempi historia";
"longer_history_message" = "Ruuvi Station -mobiilisovellus tukee maksimissaan 10 päivän historiaa. Ruuvi Cloud -tilaajat voivat tarkastella historiatietoja jopa 2 vuoden ajalta web-sovelluksessa osoitteessa ruuvi.com/fi/station (vaatii Ruuvi Gateway -reitittimen).";
"reading_history_x" = "Bluetooth-lataus: %0.f";
"reading_history_x" = "Bluetooth-lataus: %.0f";
"rssi_alert_description" = "Tämän hälytyksen käyttö vaatii, että olet sisäänkirjautunut sovellukseen, sinut on merkitty anturin omistajaksi ja anturi on Ruuvi Gateway -reitittimen kuuluvuusalueella. iOS-päätelaitteet eivät pysty näyttämään Ruuvin anturien lähettämien viestien signaalinvoimakkuustietoja anturin ollessa paritettuna ja kun mittauksia luetaan taustalla. Reaaliaikainen Bluetooth-signaalinvoimakkuus näytetään sovelluksessa, mutta sitä ei käytetä tässä hälytyksessä.";
"bluetooth_download" = "Bluetooth-lataus";
"bluetooth_download_description" = "Voit ladata anturin sisäisen historian ollessasi Bluetooth-kantaman sisällä.";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
"LocalNotificationsManager.HighTemperature.title" = "Température trop haute !";
"LocalNotificationsManager.LowTemperature.title" = "Température trop basse !";
"TagSettings.Alerts.Off" = "Désactivé";
"TagSettings.Alerts.Temperature.description" = "Notifier si la valeur est inférieure à %0.f ou supérieure à %0.f";
"TagSettings.Alerts.Temperature.description" = "Notifier si la valeur est inférieure à %.0f ou supérieure à %.0f";
"TagSettings.Label.alerts.text" = "Notifications";
"TagSettings.backgroundImageLabel.text" = "Fond d'écran";
"TagSettings.batteryVoltageTitleLabel.text" = "Tension de la pile";
Expand Down Expand Up @@ -558,8 +558,8 @@ RuuviTag est prêt à être utilisé !";
"TagSettings.Alert.SetHumidity.title" = "Réglage de l'alerte d'humidité";
"TagSettings.Alert.SetPressure.title" = "Régler l'alerte de pression";
"TagSettings.Alert.SetRSSI.title" = "Définir une alerte sur la puissance du signal";
"TagSettings.AlertSettings.Dialog.Min" = "Min (%0.f)";
"TagSettings.AlertSettings.Dialog.Max" = "Max (%0.f)";
"TagSettings.AlertSettings.Dialog.Min" = "Min (%.0f)";
"TagSettings.AlertSettings.Dialog.Max" = "Max (%.0f)";
"export_history" = "Exportation de l'historique (csv)";
"clear_view" = "Vue historique vide";
"day_1" = "1 jour";
Expand All @@ -572,12 +572,12 @@ RuuviTag est prêt à être utilisé !";
"day_8" = "8 jours";
"day_9" = "9 jours";
"day_10" = "10 jours";
"day_x" = "%0.f jours";
"day_x" = "%.0f jours";
"more" = "Plus...";
"all" = "Tout";
"longer_history_title" = "Une histoire plus longue";
"longer_history_message" = "L'application mobile Ruuvi Station prend en charge un maximum de 10 jours d'historique. Les abonnés à Ruuvi Cloud peuvent consulter jusqu'à 2 ans d'historique en utilisant l'application web à ruuvi.com/station (nécessite le routeur Ruuvi Gateway).";
"reading_history_x" = "Bluetooth sync: %0.f";
"reading_history_x" = "Bluetooth sync: %.0f";
"rssi_alert_description" = "L'utilisation de cette alerte nécessite que vous soyez connecté à l'application, que vous ayez revendiqué la propriété de ce capteur et qu'il se trouve dans le rayon d'action du routeur de la passerelle Ruuvi. Les appareils iOS sont incapables d'indiquer l'intensité du signal des données reçues envoyées par le capteur Ruuvi lorsque le capteur est apparié et que des mesures sont reçues en arrière-plan. La puissance du signal Bluetooth en temps réel est affichée dans l'application mais n'affecte pas cette alerte.";
"bluetooth_download" = "Téléchargement Bluetooth";
"bluetooth_download_description" = "Les données du capteur local peuvent être téléchargées lorsque vous êtes dans sa portée Bluetooth.";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ If you cannot see the Language option in the settings, make sure that you have a
"LocalNotificationsManager.HighTemperature.title" = "Высокая температура!";
"LocalNotificationsManager.LowTemperature.title" = "Низкая температура!";
"TagSettings.Alerts.Off" = "Отключено";
"TagSettings.Alerts.Temperature.description" = "Уведомление если меньше %0.f или больше %0.f";
"TagSettings.Alerts.Temperature.description" = "Уведомление если меньше %.0f или больше %.0f";
"TagSettings.Label.alerts.text" = "Уведомления";
"TagSettings.backgroundImageLabel.text" = "Фоновое изображение";
"TagSettings.batteryVoltageTitleLabel.text" = "Напряжение Батареи";
Expand Down Expand Up @@ -559,8 +559,8 @@ If you cannot see the Language option in the settings, make sure that you have a
"TagSettings.Alert.SetHumidity.title" = "Set humidity alert";
"TagSettings.Alert.SetPressure.title" = "Set pressure alert";
"TagSettings.Alert.SetRSSI.title" = "Set signal strength alert";
"TagSettings.AlertSettings.Dialog.Min" = "Min (%0.f)";
"TagSettings.AlertSettings.Dialog.Max" = "Max (%0.f)";
"TagSettings.AlertSettings.Dialog.Min" = "Min (%.0f)";
"TagSettings.AlertSettings.Dialog.Max" = "Max (%.0f)";
"export_history" = "Выгрузить историю (csv)";
"clear_view" = "Clear history view";
"day_1" = "1 день";
Expand All @@ -573,12 +573,12 @@ If you cannot see the Language option in the settings, make sure that you have a
"day_8" = "8 дней";
"day_9" = "9 дней";
"day_10" = "10 дней";
"day_x" = "%0.f days";
"day_x" = "%.0f days";
"more" = "Больше...";
"all" = "All";
"longer_history_title" = "Longer history";
"longer_history_message" = "Ruuvi Station mobile app supports maximum 10 days of history. Ruuvi Cloud subscribers are able to view up to 2 years of historical data using web app at ruuvi.com/station (requires Ruuvi Gateway router).";
"reading_history_x" = "Bluetooth sync: %0.f";
"reading_history_x" = "Bluetooth sync: %.0f";
"rssi_alert_description" = "Using this alert requires you to be signed in to the app, and that you have claimed the ownership of this sensor and it's in the range of Ruuvi Gateway router. iOS devices are unable to indicate signal strength information of received data sent by Ruuvi sensor when sensor is paired and measurements are being received in the background. Realtime Bluetooth signal strength is shown in the app but doesn't affect this alert.";
"bluetooth_download" = "Bluetooth download";
"bluetooth_download_description" = "Local sensor data can be downloaded, when you're within its Bluetooth range.";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ Om du inte kan se språkalternativet i inställningarna, se till att du har lagt
"LocalNotificationsManager.HighTemperature.title" = "För hög temperatur!";
"LocalNotificationsManager.LowTemperature.title" = "För låg temperatur!";
"TagSettings.Alerts.Off" = "Av";
"TagSettings.Alerts.Temperature.description" = "Alarmera när mindre än %0.f eller mer än %0.f";
"TagSettings.Alerts.Temperature.description" = "Alarmera när mindre än %.0f eller mer än %.0f";
"TagSettings.Label.alerts.text" = "Alarm";
"TagSettings.backgroundImageLabel.text" = "Bakgrundsbild";
"TagSettings.batteryVoltageTitleLabel.text" = "Batterispänning";
Expand Down Expand Up @@ -559,8 +559,8 @@ RuuviTag-sensorn är redo att användas!";
"TagSettings.Alert.SetHumidity.title" = "Ställ in fuktighetsalarm";
"TagSettings.Alert.SetPressure.title" = "Ställ in lufttryckssalarm";
"TagSettings.Alert.SetRSSI.title" = "Ställ in signalstyrkealarm";
"TagSettings.AlertSettings.Dialog.Min" = "Min (%0.f)";
"TagSettings.AlertSettings.Dialog.Max" = "Max (%0.f)";
"TagSettings.AlertSettings.Dialog.Min" = "Min (%.0f)";
"TagSettings.AlertSettings.Dialog.Max" = "Max (%.0f)";
"export_history" = "Exportera historik (csv)";
"clear_view" = "Töm historikvy";
"day_1" = "1 dag";
Expand All @@ -573,12 +573,12 @@ RuuviTag-sensorn är redo att användas!";
"day_8" = "8 dagar";
"day_9" = "9 dagar";
"day_10" = "10 dagar";
"day_x" = "%0.f dagar";
"day_x" = "%.0f dagar";
"more" = "Mer...";
"all" = "Allt";
"longer_history_title" = "Längre historik";
"longer_history_message" = "Ruuvi Station mobilapp stöder högst 10 dagars historik. Ruuvi Cloud-prenumeranter kan se upp till 2 års historisk data med hjälp av webbappen på ruuvi.com/station (kräver Ruuvi Gateway-router).";
"reading_history_x" = "Läser Bluetooth: %0.f";
"reading_history_x" = "Läser Bluetooth: %.0f";
"rssi_alert_description" = "För att använda denna avisering måste du vara inloggad i appen, att du har tagit ägandeskap av den här sensorn och att den är inom räckhåll för Ruuvi Gateway-routern. IOS-enheter kan inte visa signalstyrka för mottagna data som skickas av Ruuvi-sensorn när sensorn är parat och mätningar mottas i bakgrunden. Realtids Bluetooth-signalstyrka visas i appen men påverkar inte denna avisering.";
"bluetooth_download" = "Bluetooth-nedladdning";
"bluetooth_download_description" = "Lokal sensordata kan laddas ner när du är inom Bluetooth-räckvidd.";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,10 @@ public enum RuuviLocalization {
public static let day8 = RuuviLocalization.tr("Localizable", "day_8", fallback: "8 days")
/// 9 days
public static let day9 = RuuviLocalization.tr("Localizable", "day_9", fallback: "9 days")
/// %0.f days
public static let dayX = RuuviLocalization.tr("Localizable", "day_x", fallback: "%0.f days")
/// %.0f days
public static func dayX(_ p1: Float) -> String {
return RuuviLocalization.tr("Localizable", "day_x", p1, fallback: "%.0f days")
}
/// dBm
public static let dBm = RuuviLocalization.tr("Localizable", "dBm", fallback: "dBm")
/// Are you sure?
Expand Down Expand Up @@ -349,8 +351,10 @@ public enum RuuviLocalization {
public static let openSensorView = RuuviLocalization.tr("Localizable", "open_sensor_view", fallback: "Open sensor view")
/// Owner's Ruuvi Plan
public static let ownersPlan = RuuviLocalization.tr("Localizable", "owners_plan", fallback: "Owner's Ruuvi Plan")
/// Reading Bluetooth: %0.f
public static let readingHistoryX = RuuviLocalization.tr("Localizable", "reading_history_x", fallback: "Reading Bluetooth: %0.f")
/// Reading Bluetooth: %.0f
public static func readingHistoryX(_ p1: Float) -> String {
return RuuviLocalization.tr("Localizable", "reading_history_x", p1, fallback: "Reading Bluetooth: %.0f")
}
/// Remove
public static let remove = RuuviLocalization.tr("Localizable", "Remove", fallback: "Remove")
/// By removing the sensor, your sensor ownership status will be revoked and sensor settings, such as name, background image, calibration settings and alert settings will be removed. After removal, someone else can claim ownership of the sensor. Each Ruuvi sensor can have only one owner.
Expand Down Expand Up @@ -1920,10 +1924,14 @@ public enum RuuviLocalization {
}
public enum AlertSettings {
public enum Dialog {
/// Max (%0.f)
public static let max = RuuviLocalization.tr("Localizable", "TagSettings.AlertSettings.Dialog.Max", fallback: "Max (%0.f)")
/// Min (%0.f)
public static let min = RuuviLocalization.tr("Localizable", "TagSettings.AlertSettings.Dialog.Min", fallback: "Min (%0.f)")
/// Max (%.0f)
public static func max(_ p1: Float) -> String {
return RuuviLocalization.tr("Localizable", "TagSettings.AlertSettings.Dialog.Max", p1, fallback: "Max (%.0f)")
}
/// Min (%.0f)
public static func min(_ p1: Float) -> String {
return RuuviLocalization.tr("Localizable", "TagSettings.AlertSettings.Dialog.Min", p1, fallback: "Min (%.0f)")
}
}
}
public enum Alerts {
Expand Down Expand Up @@ -1956,8 +1964,10 @@ public enum RuuviLocalization {
}
}
public enum Temperature {
/// Alert when less than %0.f or more than %0.f
public static let description = RuuviLocalization.tr("Localizable", "TagSettings.Alerts.Temperature.description", fallback: "Alert when less than %0.f or more than %0.f")
/// Alert when less than %.0f or more than %.0f
public static func description(_ p1: Float, _ p2: Float) -> String {
return RuuviLocalization.tr("Localizable", "TagSettings.Alerts.Temperature.description", p1, p2, fallback: "Alert when less than %.0f or more than %.0f")
}
}
}
public enum AlertsAreDisabled {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
{% for item in document.data["translations"] %}
{% if item["ident_ios"] != "" %}
{% set localizeKey %}{{item["ident_ios"]}}{% endset %}
{% set defaultLocalizeValue %}{{item["en"]|replace:"{%@^%1$s}","%@"|replace:"{%.0f^%1$,d}","%.0f"|replace:"{%d^%1$,d}","%d"|replace:"{%d^%2$,d}","%d"|replace:"{%.0f^%2$,d}","%.0f"|replace:"{%.0f^%1$s}","%0.f" | replace:"{%.0f^%2$s}","%0.f"}}{% endset %}
{% set localizeValue %}{{item["de"]|replace:"{%@^%1$s}","%@"|replace:"{%.0f^%1$,d}","%.0f"|replace:"{%d^%1$,d}","%d"|replace:"{%d^%2$,d}","%d"|replace:"{%.0f^%2$,d}","%.0f"|replace:"{%.0f^%1$s}","%0.f" | replace:"{%.0f^%2$s}","%0.f"}}{% endset %}
{% set defaultLocalizeValue %}{{item["en"]|replace:"{%@^%1$s}","%@"|replace:"{%.0f^%1$,d}","%.0f"|replace:"{%d^%1$,d}","%d"|replace:"{%d^%2$,d}","%d"|replace:"{%.0f^%2$,d}","%.0f"|replace:"{%.0f^%1$s}","%.0f" | replace:"{%.0f^%2$s}","%.0f"}}{% endset %}
{% set localizeValue %}{{item["de"]|replace:"{%@^%1$s}","%@"|replace:"{%.0f^%1$,d}","%.0f"|replace:"{%d^%1$,d}","%d"|replace:"{%d^%2$,d}","%d"|replace:"{%.0f^%2$,d}","%.0f"|replace:"{%.0f^%1$s}","%.0f" | replace:"{%.0f^%2$s}","%.0f"}}{% endset %}
{% if not localizeValue %}
"{{localizeKey}}" = "{{defaultLocalizeValue}}";
{% else %}
Expand Down
Loading