From db321863a6d4448360521d0a3db642ee926e9a1c Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 13 Jun 2009 14:05:13 +0800 Subject: 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: --- modules/gallery/helpers/gallery.php | 6 +++--- modules/gallery/helpers/gallery_installer.php | 6 ++++++ modules/gallery/module.info | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) (limited to 'modules') 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 Gallery %version"); + } 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); } } diff --git a/modules/gallery/module.info b/modules/gallery/module.info index ff7da82d..3a5dd593 100644 --- a/modules/gallery/module.info +++ b/modules/gallery/module.info @@ -1,3 +1,3 @@ name = Gallery 3 description = Gallery core application -version = 1 +version = 2 -- cgit v1.2.3