diff --git a/src/components/modals/main/marketplace/sections/Marketplace.jsx b/src/components/modals/main/marketplace/sections/Marketplace.jsx index 16c9f564..b5a5167a 100644 --- a/src/components/modals/main/marketplace/sections/Marketplace.jsx +++ b/src/components/modals/main/marketplace/sections/Marketplace.jsx @@ -353,7 +353,7 @@ export default class Marketplace extends PureComponent {
this.reloadItems()}> - Refresh + {this.getMessage('widgets.navbar.tooltips.refresh')} - +
- +
{getMessage('modals.main.settings.sections.time.percentage_complete')} - + {timeSettings} diff --git a/src/components/modals/main/settings/sections/Weather.jsx b/src/components/modals/main/settings/sections/Weather.jsx index 3a24b6e4..b42d0ee7 100644 --- a/src/components/modals/main/settings/sections/Weather.jsx +++ b/src/components/modals/main/settings/sections/Weather.jsx @@ -116,49 +116,6 @@ export default class TimeSettings extends PureComponent { category="weather" /> - {localStorage.getItem('weatherType') > 1 && ( - - - - - - - - - - - - - - - )} {localStorage.getItem('weatherType') == 4 && ( props.changeTab(type)} current="marketplace"> -
+
@@ -20,7 +20,7 @@ export default function Marketplace(props) {
-
+
diff --git a/src/components/modals/main/tabs/backend/Tab.jsx b/src/components/modals/main/tabs/backend/Tab.jsx index 49d64110..aa07e7fe 100644 --- a/src/components/modals/main/tabs/backend/Tab.jsx +++ b/src/components/modals/main/tabs/backend/Tab.jsx @@ -118,6 +118,7 @@ function Tab({ label, currentTab, onClick, navbarTab }) { break; case getMessage('modals.main.addons.added'): + mue = true; icon = ; break; case getMessage('modals.main.addons.sideload.title'): @@ -130,6 +131,7 @@ function Tab({ label, currentTab, onClick, navbarTab }) { case getMessage('modals.main.marketplace.all'): icon = ; divider = true; + mue = true; break; case getMessage('modals.main.marketplace.photo_packs'): icon = ; @@ -140,7 +142,7 @@ function Tab({ label, currentTab, onClick, navbarTab }) { case getMessage('modals.main.marketplace.preset_settings'): icon = ; break; - case 'Collections': + case getMessage('modals.main.marketplace.collection'): icon = ; break; diff --git a/src/components/widgets/navbar/Notes.jsx b/src/components/widgets/navbar/Notes.jsx index 7f9a5225..3ce1a5e8 100644 --- a/src/components/widgets/navbar/Notes.jsx +++ b/src/components/widgets/navbar/Notes.jsx @@ -107,17 +107,30 @@ class Notes extends PureComponent {
- + - + - + diff --git a/src/components/widgets/navbar/Todo.jsx b/src/components/widgets/navbar/Todo.jsx index 7fb6da98..5e4813b0 100644 --- a/src/components/widgets/navbar/Todo.jsx +++ b/src/components/widgets/navbar/Todo.jsx @@ -202,7 +202,7 @@ class Todo extends PureComponent { onChange={(data) => this.updateTodo('set', index, data)} readOnly={this.state.todo[index].done} /> - this.updateTodo('remove', index)} /> + this.updateTodo('remove', index)} />
} diff --git a/src/components/widgets/weather/Weather.jsx b/src/components/widgets/weather/Weather.jsx index 95e40629..92eac9ca 100644 --- a/src/components/widgets/weather/Weather.jsx +++ b/src/components/widgets/weather/Weather.jsx @@ -6,6 +6,7 @@ import { MdDisabledVisible } from 'react-icons/md'; import WeatherIcon from './WeatherIcon'; import WindDirectionIcon from './WindDirectionIcon'; +import Tooltip from '../../helpers/tooltip/Tooltip'; import EventBus from 'modules/helpers/eventbus'; import './weather.scss'; @@ -190,30 +191,6 @@ export default class Weather extends PureComponent { const expandedInfo = () => { return (
- {/*} - {enabled('upcomingForecast') ? ( - <> - Upcoming Forecast -
-
- - 15:00 - {minmax()} -
-
- - 16:00 - {minmax()} -
-
- - 17:00 - {minmax()} -
-
- - ) : null} - */} {weatherType >= 3 && ( {variables.language.getMessage( @@ -223,48 +200,88 @@ export default class Weather extends PureComponent { )} {enabled('cloudiness') || weatherType === 3 ? ( - - - {this.state.weather.cloudiness}% - + + + + {this.state.weather.cloudiness}% + + ) : null} {enabled('windspeed') || weatherType === 3 ? ( - - - {this.state.weather.wind_speed} - m/s{' '} - {enabled('windDirection') ? ( -
- -
- ) : null} -
+ + + + {this.state.weather.wind_speed} + m/s{' '} + {enabled('windDirection') ? ( +
+ +
+ ) : null} +
+
) : null} {enabled('atmosphericpressure') || weatherType === 3 ? ( - - - {this.state.weather.pressure} - hPa - + + + + {this.state.weather.pressure} + hPa + + ) : null} {enabled('weatherdescription') || weatherType === 3 ? ( - -
- -
- {this.state.weather.description} -
+ + +
+ +
+ {this.state.weather.description} +
+
) : null} {enabled('visibility') || weatherType === 3 ? ( - - - {variables.language.getMessage(variables.languagecode, 'widgets.weather.meters', { - amount: this.state.weather.visibility, - })} - + + + + {variables.language.getMessage(variables.languagecode, 'widgets.weather.meters', { + amount: this.state.weather.visibility, + })} + + ) : null}
); diff --git a/src/components/widgets/weather/weather.scss b/src/components/widgets/weather/weather.scss index dbc10fc8..5a5f8bb1 100644 --- a/src/components/widgets/weather/weather.scss +++ b/src/components/widgets/weather/weather.scss @@ -21,9 +21,13 @@ } .expanded-info { + width: 100%; display: flex; flex-direction: column; align-items: flex-start; + .tooltip { + width: 100%; + } } .extra-info { diff --git a/src/translations/de_DE.json b/src/translations/de_DE.json index b0214570..0e36fea2 100644 --- a/src/translations/de_DE.json +++ b/src/translations/de_DE.json @@ -112,7 +112,12 @@ "hour_marks": "Stunden-Markierungen", "minute_marks": "Minuten-Markierungen" }, - "percentage_complete": "Denn Tages fotschritt in Prozent anzeigen" + "percentage_complete": "Denn Tages fotschritt in Prozent anzeigen", + "vertical_clock": { + "title": "Vertical Clock", + "change_hour_colour": "Change hour text colour", + "change_minute_colour": "Change minute text colour" + } }, "date": { "title": "Datum", @@ -462,6 +467,7 @@ "preset_settings": "Voreingestellte Einstellungen", "no_items": "Keine Einträge in dieser Kategorie", "explore_collection": "Explore Collection", + "collection": "Collections", "cant_find": "Can't find what you're looking for?", "knowledgebase_one": "Visit the", "knowledgebase_two": "knowledgebase", diff --git a/src/translations/en_GB.json b/src/translations/en_GB.json index 762d33f2..5d2419a9 100644 --- a/src/translations/en_GB.json +++ b/src/translations/en_GB.json @@ -112,7 +112,12 @@ "hour_marks": "Hour marks", "minute_marks": "Minute marks" }, - "percentage_complete": "Percentage complete" + "percentage_complete": "Percentage complete", + "vertical_clock": { + "title": "Vertical Clock", + "change_hour_colour": "Change hour text colour", + "change_minute_colour": "Change minute text colour" + } }, "date": { "title": "Date", @@ -461,6 +466,7 @@ "preset_settings": "Preset Settings", "no_items": "No items in this category", "explore_collection": "Explore Collection", + "collection": "Collections", "cant_find": "Can't find what you're looking for?", "knowledgebase_one": "Visit the", "knowledgebase_two": "knowledgebase", diff --git a/src/translations/en_US.json b/src/translations/en_US.json index 5cc1afb3..bb0027d5 100644 --- a/src/translations/en_US.json +++ b/src/translations/en_US.json @@ -112,7 +112,12 @@ "hour_marks": "Hour marks", "minute_marks": "Minute marks" }, - "percentage_complete": "Percentage complete" + "percentage_complete": "Percentage complete", + "vertical_clock": { + "title": "Vertical Clock", + "change_hour_colour": "Change hour text colour", + "change_minute_colour": "Change minute text colour" + } }, "date": { "title": "Date", @@ -461,6 +466,7 @@ "preset_settings": "Preset Settings", "no_items": "No items in this category", "explore_collection": "Explore Collection", + "collection": "Collections", "cant_find": "Can't find what you're looking for?", "knowledgebase_one": "Visit the", "knowledgebase_two": "knowledgebase", diff --git a/src/translations/es.json b/src/translations/es.json index 6696b1d0..268aacb4 100644 --- a/src/translations/es.json +++ b/src/translations/es.json @@ -112,7 +112,12 @@ "hour_marks": "Marcas de las horas", "minute_marks": "Marcas de los minutos" }, - "percentage_complete": "Porcentaje completado" + "percentage_complete": "Porcentaje completado", + "vertical_clock": { + "title": "Vertical Clock", + "change_hour_colour": "Change hour text colour", + "change_minute_colour": "Change minute text colour" + } }, "date": { "title": "Fecha", @@ -461,6 +466,7 @@ "preset_settings": "Ajustes preestablecidos", "no_items": "No hay artículos en esta categoría", "explore_collection": "Explore Collection", + "collection": "Collections", "cant_find": "Can't find what you're looking for?", "knowledgebase_one": "Visit the", "knowledgebase_two": "knowledgebase", diff --git a/src/translations/fr.json b/src/translations/fr.json index b1a11cd7..b17b2aae 100644 --- a/src/translations/fr.json +++ b/src/translations/fr.json @@ -112,7 +112,12 @@ "hour_marks": "Marques d'heure", "minute_marks": "Marques des minutes" }, - "percentage_complete": "Pourcentage achevé" + "percentage_complete": "Pourcentage achevé", + "vertical_clock": { + "title": "Vertical Clock", + "change_hour_colour": "Change hour text colour", + "change_minute_colour": "Change minute text colour" + } }, "date": { "title": "Date", @@ -461,6 +466,7 @@ "preset_settings": "Paramètres prédéfinis", "no_items": "Aucun article dans cette catégorie", "explore_collection": "Explore Collection", + "collection": "Collections", "cant_find": "Can't find what you're looking for?", "knowledgebase_one": "Visit the", "knowledgebase_two": "knowledgebase", diff --git a/src/translations/id_ID.json b/src/translations/id_ID.json index 39e45e42..3da7513c 100644 --- a/src/translations/id_ID.json +++ b/src/translations/id_ID.json @@ -112,7 +112,12 @@ "hour_marks": "Penanda Jam", "minute_marks": "Penanda Menit" }, - "percentage_complete": "Persentase" + "percentage_complete": "Persentase", + "vertical_clock": { + "title": "Vertical Clock", + "change_hour_colour": "Change hour text colour", + "change_minute_colour": "Change minute text colour" + } }, "date": { "title": "Tanggal", @@ -461,6 +466,7 @@ "preset_settings": "Preset Settings", "no_items": "Tidak ada item pada kategori ini", "explore_collection": "Explore Collection", + "collection": "Collections", "cant_find": "Can't find what you're looking for?", "knowledgebase_one": "Visit the", "knowledgebase_two": "knowledgebase", diff --git a/src/translations/nl.json b/src/translations/nl.json index 9aa798c8..8e072730 100644 --- a/src/translations/nl.json +++ b/src/translations/nl.json @@ -112,7 +112,12 @@ "hour_marks": "Hour marks", "minute_marks": "Minute marks" }, - "percentage_complete": "Percentage complete" + "percentage_complete": "Percentage complete", + "vertical_clock": { + "title": "Vertical Clock", + "change_hour_colour": "Change hour text colour", + "change_minute_colour": "Change minute text colour" + } }, "date": { "title": "Date", @@ -461,6 +466,7 @@ "preset_settings": "Voorinstellingen", "no_items": "No items in this category", "explore_collection": "Explore Collection", + "collection": "Collections", "cant_find": "Can't find what you're looking for?", "knowledgebase_one": "Visit the", "knowledgebase_two": "knowledgebase", diff --git a/src/translations/no.json b/src/translations/no.json index 9b6ee2ae..a3369a11 100644 --- a/src/translations/no.json +++ b/src/translations/no.json @@ -112,7 +112,12 @@ "hour_marks": "Hour marks", "minute_marks": "Minute marks" }, - "percentage_complete": "Percentage complete" + "percentage_complete": "Percentage complete", + "vertical_clock": { + "title": "Vertical Clock", + "change_hour_colour": "Change hour text colour", + "change_minute_colour": "Change minute text colour" + } }, "date": { "title": "Date", @@ -461,6 +466,7 @@ "preset_settings": "Preset instillinger", "no_items": "No items in this category", "explore_collection": "Explore Collection", + "collection": "Collections", "cant_find": "Can't find what you're looking for?", "knowledgebase_one": "Visit the", "knowledgebase_two": "knowledgebase", diff --git a/src/translations/ru.json b/src/translations/ru.json index e05fe004..eb3607d3 100644 --- a/src/translations/ru.json +++ b/src/translations/ru.json @@ -112,7 +112,12 @@ "hour_marks": "Hour marks", "minute_marks": "Minute marks" }, - "percentage_complete": "Percentage complete" + "percentage_complete": "Percentage complete", + "vertical_clock": { + "title": "Vertical Clock", + "change_hour_colour": "Change hour text colour", + "change_minute_colour": "Change minute text colour" + } }, "date": { "title": "Date", @@ -461,6 +466,7 @@ "preset_settings": "Пресеты настроек", "no_items": "No items in this category", "explore_collection": "Explore Collection", + "collection": "Collections", "cant_find": "Can't find what you're looking for?", "knowledgebase_one": "Visit the", "knowledgebase_two": "knowledgebase", diff --git a/src/translations/tr_TR.json b/src/translations/tr_TR.json index f1818a4c..01104221 100644 --- a/src/translations/tr_TR.json +++ b/src/translations/tr_TR.json @@ -112,7 +112,12 @@ "hour_marks": "Saat Çizgileri", "minute_marks": "Dakika Çizgileri" }, - "percentage_complete": "Yüzdelik Gösterim" + "percentage_complete": "Yüzdelik Gösterim", + "vertical_clock": { + "title": "Vertical Clock", + "change_hour_colour": "Change hour text colour", + "change_minute_colour": "Change minute text colour" + } }, "date": { "title": "Gün", @@ -461,6 +466,7 @@ "preset_settings": "Ön Ayar Ayarları", "no_items": "Bu kategoride öğe yok", "explore_collection": "Koleksiyonu Keşfedin", + "collection": "Collections", "cant_find": "Aradığınızı bulamıyor musunuz?", "knowledgebase_one": "Kendiniz oluşturmak için", "knowledgebase_two": "bilgilendirme sayfamızı", diff --git a/src/translations/zh_CN.json b/src/translations/zh_CN.json index e90813e2..7549ecb3 100644 --- a/src/translations/zh_CN.json +++ b/src/translations/zh_CN.json @@ -112,7 +112,12 @@ "hour_marks": "时钟刻度", "minute_marks": "分钟刻度" }, - "percentage_complete": "今天过去了%几" + "percentage_complete": "今天过去了%几", + "vertical_clock": { + "title": "Vertical Clock", + "change_hour_colour": "Change hour text colour", + "change_minute_colour": "Change minute text colour" + } }, "date": { "title": "显示日期", @@ -461,6 +466,7 @@ "preset_settings": "预设设定", "no_items": "本类别为空", "explore_collection": "Explore Collection", + "collection": "Collections", "cant_find": "Can't find what you're looking for?", "knowledgebase_one": "Visit the", "knowledgebase_two": "knowledgebase",