make utils.cpp's generate_full_format_string_at_time() a standalone function so that the panels can use the utils functions without a libindicatordatetime dependency

1 files changed, 28 insertions, 22 deletions

diff --git a/include/datetime/utils.h b/include/datetime/utils.h
index 10e881f..7cac9fd 100644
--- a/include/datetime/utils.h
+++ b/include/datetime/utils.h
@@ -1,24 +1,22 @@
-/* -*- Mode: C; coding: utf-8; indent-tabs-mode: nil; tab-width: 2 -*-
-
-A dialog for setting time and date preferences.
-
-Copyright 2010 Canonical Ltd.
-
-Authors:
-    Michael Terry <michael.terry@canonical.com>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+/*
+ * Copyright 2010, 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Michael Terry <michael.terry@canonical.com>
+ *   Charles Kerr <charles.kerr@canonical.com>
+ */
 
 #ifndef INDICATOR_DATETIME_UTILS_H
 #define INDICATOR_DATETIME_UTILS_H
@@ -28,6 +26,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 G_BEGIN_DECLS
 
+/** \brief Returns true if the current locale prefers 12h display instead of 24h */
 gboolean      is_locale_12h                        (void);
 
 void          split_settings_location              (const char  * location,
@@ -41,7 +40,14 @@ gchar *       get_beautified_timezone_name         (const char  * timezone,
                                                     const char  * saved_location);
 
 gchar *       generate_full_format_string_at_time  (GDateTime   * now,
-                                                    GDateTime   * time);
+                                                    GDateTime   * then_begin,
+                                                    GDateTime   * then_end);
+
+/** \brief Translate the string based on LC_TIME instead of LC_MESSAGES.
+           The intent of this is to let users set LC_TIME to override
+           their other locale settings when generating time format string */
+const char*   T_                                   (const char  * msg);
+
   
 G_END_DECLS