From c8e547a46a79df0c850fe8b3d9f20a1462a887b9 Mon Sep 17 00:00:00 2001
From: shagu <ericmauser@googlemail.com>
Date: Wed, 25 Jan 2017 23:10:29 +0100
Subject: [PATCH] panel: add option for 12 hour clock

---
 modules/config.lua |  1 +
 modules/gui.lua    |  1 +
 modules/panel.lua  | 23 ++++++++++++++++++++---
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/modules/config.lua b/modules/config.lua
index a0e69d99..c00b4ed0 100644
--- a/modules/config.lua
+++ b/modules/config.lua
@@ -15,6 +15,7 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("global",     nil,           "errors_hide",      "0")
   pfUI:UpdateConfig("global",     nil,           "hidebuff",         "0")
   pfUI:UpdateConfig("global",     nil,           "hidewbuff",        "0")
+  pfUI:UpdateConfig("global",     nil,           "twentyfour",       "1")
 
   pfUI:UpdateConfig("appearance", "border",      "background",       "0,0,0,1")
   pfUI:UpdateConfig("appearance", "border",      "color",            "0.3,0.3,0.3,1")
diff --git a/modules/gui.lua b/modules/gui.lua
index a05ca02d..e071a845 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -740,6 +740,7 @@ pfUI:RegisterModule("gui", function ()
   pfUI.gui:CreateConfig(pfUI.gui.global, "Disable UIErrors", pfUI_config.global, "errors_hide", "checkbox")
   pfUI.gui:CreateConfig(pfUI.gui.global, "Hide Buffs", pfUI_config.global, "hidebuff", "checkbox")
   pfUI.gui:CreateConfig(pfUI.gui.global, "Hide Weapon Buffs", pfUI_config.global, "hidewbuff", "checkbox")
+  pfUI.gui:CreateConfig(pfUI.gui.global, "Use 24h Clock", pfUI_config.global, "twentyfour", "checkbox")
 
   pfUI.gui:CreateConfig(pfUI.gui.global, "Profile", nil, nil, "header")
   local values = {}
diff --git a/modules/panel.lua b/modules/panel.lua
index 3c67fc35..822edef5 100644
--- a/modules/panel.lua
+++ b/modules/panel.lua
@@ -79,9 +79,22 @@ pfUI:RegisterModule("panel", function ()
         GameTooltip:ClearLines()
         GameTooltip_SetDefaultAnchor(GameTooltip, this)
         local h, m = GetGameTime()
-        local servertime = string.format("%.2d:%.2d", h, m)
+        local noon = " AM"
+        local servertime
+        local time
+        if pfUI_config.global.twentyfour == "0" then
+          if h > 12 then
+            h = h - 12
+            noon = " PM"
+          end
+          time = date("%I:%M %p")
+          servertime = string.format("%.2d:%.2d", h, m) .. noon
+        else
+          time = date("%H:%M")
+          servertime = string.format("%.2d:%.2d", h, m)
+        end
         GameTooltip:AddLine("|cff555555Time")
-        GameTooltip:AddDoubleLine("Localtime",  "|cffffffff" .. date("%H:%M"))
+        GameTooltip:AddDoubleLine("Localtime",  "|cffffffff" .. time)
         GameTooltip:AddDoubleLine("Servertime", "|cffffffff".. servertime)
         GameTooltip:AddLine(" ")
         GameTooltip:AddDoubleLine("Left Click", "|cffffffffShow/Hide Timer")
@@ -103,7 +116,11 @@ pfUI:RegisterModule("panel", function ()
       end
 
       pfUI.panel.clock.tick = GetTime()
-      pfUI.panel:OutputPanel("time", date("%H:%M:%S"), tooltip, click)
+      if pfUI_config.global.twentyfour == "0" then
+        pfUI.panel:OutputPanel("time", date("%I:%M:%S %p"), tooltip, click)
+      else
+        pfUI.panel:OutputPanel("time", date("%H:%M:%S"), tooltip, click)
+      end
 
       -- lag fps
       local tooltip = function ()