Merge pull request xbmc#24899 from yol/remove-timezone-setting

Remove timezone setting within Kodi
Memphiz · Apr 5, 2024 · e68b021 · e68b021
2 parents eec13a6 + 118876b
commit e68b021
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 477 deletions.
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
@@ -8078,15 +8078,7 @@ msgctxt "#14078"
 msgid "Colours"
 msgstr ""
 
-#: system/settings/settings.xml
-msgctxt "#14079"
-msgid "Timezone country"
-msgstr ""
-
-#: system/settings/settings.xml
-msgctxt "#14080"
-msgid "Timezone"
-msgstr ""
+#empty strings from id 14072 to 14073
 
 #: system/settings/settings.xml
 msgctxt "#14081"
@@ -19221,17 +19213,7 @@ msgctxt "#36116"
 msgid "Choose which character set is used for displaying text in the user interface. This doesn't change the character set used for subtitles, for that go to Player > Language."
 msgstr ""
 
-#. Description of setting with label #14079 "Timezone country"
-#: system/settings/settings.xml
-msgctxt "#36117"
-msgid "Select country location."
-msgstr ""
-
-#. Description of setting with label #14080 "Timezone"
-#: system/settings/settings.xml
-msgctxt "#36118"
-msgid "Select your current timezone."
-msgstr ""
+#empty strings from id 36117 to 36118
 
 #. Description of setting with label #285 "Preferred audio language"
 #: system/settings/settings.xml

diff --git a/system/settings/android.xml b/system/settings/android.xml
@@ -29,16 +29,4 @@
       </group>
     </category>
   </section>
-  <section id="interface">
-    <category id="regional">
-      <group id="2">
-        <setting id="locale.timezonecountry">
-          <visible>false</visible>
-        </setting>
-        <setting id="locale.timezone">
-          <visible>false</visible>
-        </setting>
-      </group>
-    </category>
-  </section>
 </settings>
diff --git a/system/settings/settings.xml b/system/settings/settings.xml
@@ -4030,25 +4030,6 @@
           </dependencies>
           <control type="list" format="string" />
         </setting>
-        <setting id="locale.timezonecountry" type="string" label="14079" help="36117">
-          <level>1</level>
-          <default>default</default> <!-- will be properly set on startup -->
-          <constraints>
-            <options>timezonecountries</options>
-          </constraints>
-          <control type="list" format="string" />
-        </setting>
-        <setting id="locale.timezone" type="string" label="14080" help="36118">
-          <level>1</level>
-          <default>default</default> <!-- will be properly set on startup -->
-          <constraints>
-            <options>timezones</options>
-          </constraints>
-          <dependencies>
-            <dependency type="update" setting="locale.timezonecountry" />
-          </dependencies>
-          <control type="list" format="string" />
-        </setting>
         <setting id="locale.shortdateformat" type="string" label="14109" help="36173">
           <level>2</level>
           <default>regional</default>

diff --git a/system/settings/windows.xml b/system/settings/windows.xml
@@ -58,16 +58,4 @@
       </group>
     </category>
   </section>
-  <section id="interface">
-    <category id="regional">
-      <group id="2">
-        <setting id="locale.timezonecountry">
-          <visible>false</visible>
-        </setting>
-        <setting id="locale.timezone">
-          <visible>false</visible>
-        </setting>
-      </group>
-    </category>
-  </section>
 </settings>
diff --git a/xbmc/guilib/guiinfo/SystemGUIInfo.cpp b/xbmc/guilib/guiinfo/SystemGUIInfo.cpp
@@ -327,20 +327,6 @@ bool CSystemGUIInfo::GetLabel(std::string& value, const CFileItem *item, int con
       return true;
     }
 
-    case SYSTEM_LOCALE_TIMEZONECOUNTRY:
-    {
-      value = CServiceBroker::GetSettingsComponent()->GetSettings()->GetString(
-          CSettings::SETTING_LOCALE_TIMEZONECOUNTRY);
-      return true;
-    }
-
-    case SYSTEM_LOCALE_TIMEZONE:
-    {
-      value = CServiceBroker::GetSettingsComponent()->GetSettings()->GetString(
-          CSettings::SETTING_LOCALE_TIMEZONE);
-      return true;
-    }
-
     case SYSTEM_LOCALE_REGION:
     {
       value = g_langInfo.GetCurrentRegion();

diff --git a/xbmc/platform/posix/CMakeLists.txt b/xbmc/platform/posix/CMakeLists.txt
@@ -6,7 +6,6 @@ set(SOURCES ConvUtils.cpp
             PlatformPosix.cpp
             PosixMountProvider.cpp
             PosixResourceCounter.cpp
-            PosixTimezone.cpp
             XHandle.cpp
             XTimeUtils.cpp)
 
@@ -17,7 +16,6 @@ set(HEADERS ConvUtils.h
             PlatformPosix.h
             PosixMountProvider.h
             PosixResourceCounter.h
-            PosixTimezone.h
             XHandle.h)
 
 core_add_library(platform_posix)