aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/formatter.cpp10
-rw-r--r--src/utils.cpp8
2 files changed, 6 insertions, 12 deletions
diff --git a/src/formatter.cpp b/src/formatter.cpp
index a271ba0..989781a 100644
--- a/src/formatter.cpp
+++ b/src/formatter.cpp
@@ -20,6 +20,7 @@
#include <datetime/formatter.h>
#include <datetime/clock.h>
+#include <datetime/utils.h>
#include <glib.h>
#include <glib/gi18n.h>
@@ -226,14 +227,7 @@ Formatter::~Formatter()
bool
Formatter::is_locale_12h()
{
- static const char *formats_24h[] = {"%H", "%R", "%T", "%OH", "%k"};
- const auto t_fmt = nl_langinfo(T_FMT);
-
- for (const auto& needle : formats_24h)
- if (strstr(t_fmt, needle))
- return false;
-
- return true;
+ return ::is_locale_12h();
}
const char*
diff --git a/src/utils.cpp b/src/utils.cpp
index 0b586f4..e97b654 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -38,11 +38,11 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
gboolean
is_locale_12h()
{
- const char *t_fmt = nl_langinfo(T_FMT);
-
static const char *formats_24h[] = {"%H", "%R", "%T", "%OH", "%k"};
- for(const auto& format : formats_24h)
- if(strstr(t_fmt, format) != nullptr)
+ const auto t_fmt = nl_langinfo(T_FMT);
+
+ for (const auto& needle : formats_24h)
+ if (strstr(t_fmt, needle) != nullptr)
return false;
return true;