aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Blake <oak99sky@yahoo.co.uk>2020-02-26 16:05:27 +0000
committerGitHub <noreply@github.com>2020-02-26 16:05:27 +0000
commit1fb2e24d777a2e5c9b401ae665cca191fa3eecfa (patch)
treeab7ffb9b86eaeae7a44dae5c7c62664ffecef1c7
parent27598684c564f26599fb365aec3b7e30fb25e058 (diff)
parentd7133f63f75f4ca61f696755a82586501a74794b (diff)
Merge pull request #17395 from Maven85/region_time_leia
[backport][python] fixed incorrectly formatted region time
-rw-r--r--xbmc/interfaces/legacy/ModuleXbmc.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/xbmc/interfaces/legacy/ModuleXbmc.cpp b/xbmc/interfaces/legacy/ModuleXbmc.cpp
index 8e194e59bf..a9a3a5a3c7 100644
--- a/xbmc/interfaces/legacy/ModuleXbmc.cpp
+++ b/xbmc/interfaces/legacy/ModuleXbmc.cpp
@@ -450,7 +450,11 @@ namespace XBMCAddon
else if (strcmpi(id, "time") == 0)
{
result = g_langInfo.GetTimeFormat();
- StringUtils::Replace(result, "H", "%H");
+
+ if (StringUtils::StartsWith(result, "HH"))
+ StringUtils::Replace(result, "HH", "%H");
+ else
+ StringUtils::Replace(result, "H", "%H");
StringUtils::Replace(result, "h", "%I");
StringUtils::Replace(result, "mm", "%M");
StringUtils::Replace(result, "ss", "%S");