Move date/time format strings into a setting and bump the gallery

module to version 2.  First test of our upgrade code!

Signed-off-by:  <unostar@danalan.info>

2 files changed, 9 insertions, 3 deletions

diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index e201fded..e22cc17f 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -56,7 +56,7 @@ class gallery_Core {
    * @return string
    */
   static function date_time($timestamp) {
-    return date("Y-M-d H:i:s", $timestamp);
+    return date(module::get_var("gallery", "date_time_format", "Y-M-d H:i:s"), $timestamp);
   }
 
   /**
@@ -65,7 +65,7 @@ class gallery_Core {
    * @return string
    */
   static function date($timestamp) {
-    return date("Y-M-d", $timestamp);
+    return date(module::get_var("gallery", "date_format", "Y-M-d"), $timestamp);
   }
 
   /**
@@ -74,6 +74,6 @@ class gallery_Core {
    * @return string
    */
   static function time($timestamp) {
-    return date("H:i:s", $timestamp);
+    return date(module::get_var("gallery", "time_format", "H:i:s"), $timestamp);
   }
 }
\ No newline at end of file
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 242bb486..b2be63be 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -254,6 +254,12 @@ class gallery_installer {
 
       // @todo this string needs to be picked up by l10n_scanner
       module::set_var("gallery", "credits", "Powered by <a href=\"%url\">Gallery %version</a>");
+    } else if ($version == 1) {
+      module::set_var("gallery", "date_format", "Y-M-d");
+      module::set_var("gallery", "date_time_format", "Y-M-d H:i:s");
+      module::set_var("gallery", "time_format", "H:i:s");
+      module::set_var("gallery", "version", "3.0 pre beta 2 (git)");
+      module::set_version("gallery", 2);
     }
   }