Merge pull request xbmc#24009 from mglae/omega_python_getregion

[python] Fix xmbc.getRegion("time")
ksooo · Nov 1, 2023 · 6700236 · 6700236
2 parents 9d68f98 + d6d64da
commit 6700236
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/xbmc/interfaces/legacy/ModuleXbmc.cpp b/xbmc/interfaces/legacy/ModuleXbmc.cpp
@@ -446,11 +446,14 @@ namespace XBMCAddon
         else
         {
           StringUtils::Replace(result, "H", "%H");
+          StringUtils::Replace(result, "hh", "%I");
           StringUtils::Replace(result, "h", "%I");
-          StringUtils::Replace(result, "mm", "%M");
-          StringUtils::Replace(result, "ss", "%S");
-          StringUtils::Replace(result, "xx", "%p");
         }
+        StringUtils::Replace(result, "mm", "%M");
+        StringUtils::Replace(result, "m", "%M");
+        StringUtils::Replace(result, "ss", "%S");
+        StringUtils::Replace(result, "s", "%S");
+        StringUtils::Replace(result, "xx", "%p");
       }
       else if (StringUtils::CompareNoCase(id, "meridiem") == 0)
       {

diff --git a/xbmc/interfaces/legacy/ModuleXbmc.h b/xbmc/interfaces/legacy/ModuleXbmc.h
@@ -649,9 +649,11 @@ namespace XBMCAddon
     /// @param id                    string - id of setting to return
     /// @return                      Region setting
     ///
-    /// @note choices are (dateshort, datelong, time, meridiem, tempunit, speedunit)
-    ///        You can use the above as keywords for arguments.
+    /// @note choices are (dateshort, datelong, time, meridiem, tempunit, speedunit,
+    ///       datelongraw, dateshortraw, timeraw)
+    ///       You can use the above as keywords for arguments.
     ///
+    /// @warning an empty string is returned if the provided Id is not supported
     ///
     /// ------------------------------------------------------------------------
     ///