From 62d1e896d9db7be0b62daad7ab2b24feefd852ea Mon Sep 17 00:00:00 2001
From: Jack Allnutt <jack@allnutt.eu>
Date: Tue, 4 Feb 2014 23:05:01 +0000
Subject: [PATCH] Add setting to switch between 12 and 24 hour timestamps

Resolves #282
---
 client/assets/themes/relaxed/style.css |  4 ++--
 client/src/applets/settings.js         |  1 +
 client/src/index.html.tmpl             |  6 ++++++
 client/src/translations/en-gb.po       | 14 +++++++++++++-
 client/src/views/channel.js            | 16 ++++++++++++++--
 config.example.js                      |  1 +
 6 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/client/assets/themes/relaxed/style.css b/client/assets/themes/relaxed/style.css
index 7e9f65d..0b27d75 100644
--- a/client/assets/themes/relaxed/style.css
+++ b/client/assets/themes/relaxed/style.css
@@ -103,7 +103,7 @@
 #kiwi .messages a { text-decoration:none; }
 
 #kiwi .messages .msg { border-bottom: 1px solid #DEDEDE; padding: 1px; font-family:arial; font-size:0.9em; }
-#kiwi .messages .msg .time { width:5em; float:left; color:#777; padding:5px; display:none; }
+#kiwi .messages .msg .time { width:6em; float:left; color:#777; padding:5px; display:none; }
 #kiwi .messages .msg .nick { width:11em; float:left; font-size:12px; font-family:Arial; text-align:right; padding: 5px; overflow:hidden; }
 #kiwi .messages .msg .text { display:block; margin-left:12em; border-left: 1px solid #DEDEDE; white-space:pre-wrap; word-wrap:break-word; font-family:arial; padding:5px; }
 
@@ -131,7 +131,7 @@
 }
 
 #kiwi.timestamps .messages .msg .time { display:block; }
-#kiwi.timestamps .messages .msg .text { margin-left:17em; }
+#kiwi.timestamps .messages .msg .text { margin-left:18em; }
 
 #kiwi .messages .msg.global_nick_highlight,
 #kiwi .messages .msg.highlight { transition: background 0.3s; background:#D9D9D9; }
diff --git a/client/src/applets/settings.js b/client/src/applets/settings.js
index e88ce10..f041ab1 100644
--- a/client/src/applets/settings.js
+++ b/client/src/applets/settings.js
@@ -15,6 +15,7 @@
                 join_part: _kiwi.global.i18n.translate('client_applets_settings_notification_joinpart').fetch(),
                 count_all_activity: _kiwi.global.i18n.translate('client_applets_settings_notification_count_all_activity').fetch(),
                 timestamps: _kiwi.global.i18n.translate('client_applets_settings_timestamp').fetch(),
+                timestamp_24: _kiwi.global.i18n.translate('client_applets_settings_timestamp_24_hour').fetch(),
                 mute: _kiwi.global.i18n.translate('client_applets_settings_notification_sound').fetch(),
                 emoticons: _kiwi.global.i18n.translate('client_applets_settings_emoticons').fetch(),
                 scroll_history: _kiwi.global.i18n.translate('client_applets_settings_history_length').fetch(),
diff --git a/client/src/index.html.tmpl b/client/src/index.html.tmpl
index f0d82f5..49e146d 100644
--- a/client/src/index.html.tmpl
+++ b/client/src/index.html.tmpl
@@ -285,6 +285,12 @@
                                 <%= timestamps %>
                             </label>
                         </div>
+                        <div class="checkbox">
+                            <label>
+                                <input data-setting="use_24_hour_timestamps" type="checkbox">
+                                <%= timestamp_24 %>
+                            </label>
+                        </div>
                         <div class="checkbox">
                             <label>
                                 <input data-setting="mute_sounds" type="checkbox">
diff --git a/client/src/translations/en-gb.po b/client/src/translations/en-gb.po
index 5f40c20..1cfccc2 100755
--- a/client/src/translations/en-gb.po
+++ b/client/src/translations/en-gb.po
@@ -66,7 +66,11 @@ msgstr "Join/part channel notifications"
 
 #: 
 msgid "client_applets_settings_timestamp"
-msgstr "Timestamps"
+msgstr "Show timestamps"
+
+#: 
+msgid "client_applets_settings_timestamp_24_hour"
+msgstr "Use 24-hour timestamps"
 
 #: 
 msgid "client_applets_settings_notification_sound"
@@ -320,6 +324,14 @@ msgstr "Cancel"
 msgid "client_views_panel_activity"
 msgstr "People are talking!"
 
+#:
+msgid "client_views_panel_timestamp_am"
+msgstr "%s AM"
+
+#:
+msgid "client_views_panel_timestamp_pm"
+msgstr "%s PM"
+
 #: client/assets/src/views/serverselect.js
 msgid "client_views_serverselect_form_title"
 msgstr "Think of a nickname..."
diff --git a/client/src/views/channel.js b/client/src/views/channel.js
index e7860bc..df9d315 100644
--- a/client/src/views/channel.js
+++ b/client/src/views/channel.js
@@ -58,7 +58,8 @@ _kiwi.view.Channel = _kiwi.view.Panel.extend({
             nick_colour_hex, nick_hex, is_highlight, msg_css_classes = '',
             time_difference,
             sb = this.model.get('scrollback'),
-            prev_msg = sb[sb.length-2];
+            prev_msg = sb[sb.length-2],
+            hour, pm;
 
         // Nick highlight detecting
         if ((new RegExp('(^|\\W)(' + escapeRegex(_kiwi.app.connections.active_connection.get('nick')) + ')(\\W|$)', 'i')).test(msg.msg)) {
@@ -139,7 +140,18 @@ _kiwi.view.Channel = _kiwi.view.Panel.extend({
 
         // Build up and add the line
         msg.msg_css_classes = msg_css_classes;
-        msg.time_string = msg.time.getHours().toString().lpad(2, "0") + ":" + msg.time.getMinutes().toString().lpad(2, "0") + ":" + msg.time.getSeconds().toString().lpad(2, "0");
+        if (_kiwi.global.settings.get('use_24_hour_timestamps')) {
+            msg.time_string = msg.time.getHours().toString().lpad(2, "0") + ":" + msg.time.getMinutes().toString().lpad(2, "0") + ":" + msg.time.getSeconds().toString().lpad(2, "0");
+        } else {
+            hour = msg.time.getHours();
+            pm = hour > 11;
+            hour = (hour === 0) ? 12 : hour % 12;
+            if (pm) {
+                msg.time_string = _kiwi.global.i18n.translate('client_views_panel_timestamp_pm').fetch(hour + ":" + msg.time.getMinutes().toString().lpad(2, "0") + ":" + msg.time.getSeconds().toString().lpad(2, "0"));
+            } else {
+                msg.time_string = _kiwi.global.i18n.translate('client_views_panel_timestamp_am').fetch(hour + ":" + msg.time.getMinutes().toString().lpad(2, "0") + ":" + msg.time.getSeconds().toString().lpad(2, "0"));
+            }
+        }
         line_msg = '<div class="msg <%= type %> <%= msg_css_classes %>"><div class="time"><%- time_string %></div><div class="nick" style="<%= nick_style %>"><%- nick %></div><div class="text" style="<%= style %>"><%= msg %> </div></div>';
         this.$messages.append(_.template(line_msg, msg));
 
diff --git a/config.example.js b/config.example.js
index 722042a..1314152 100644
--- a/config.example.js
+++ b/config.example.js
@@ -182,6 +182,7 @@ conf.client = {
         scrollback: 250,
         show_joins_parts: true,
         show_timestamps: false,
+        use_24_hour_timestamps: true,
         mute_sounds: false,
         show_emoticons: true,
         count_all_activity: true
-- 
2.25.1