Jalalil and future other calendars support

diff --git a/docs/NEWS b/docs/NEWS
index da6c33e0af78a8a0a23d5aa12664cda87fd35050..3eaeb2a3c41e73cd5bb2daaab3447298cfc931ee 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 0.9 ()
 ------------------------------------------------------------------------
 
+    * New configuration item: Gregorian or Jalali Calendar output.
+      Patch by Omid Mottaghi
+
     * New personal configuration item: "Forbid creating entries" to
       allow authors to be logged in, but not create any entries. Meant
       to be used in conjunction with serendipity_plugin_adduser for

diff --git a/include/functions.inc.php b/include/functions.inc.php
index eb2a7ed65eda23b926ea914f5551157386157085..f8c38ed7c43dc7bb68db4fb3bc20ba0de421991c 100644 (file)
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -45,13 +45,28 @@ function serendipity_serverOffsetHour($timestamp = null, $negative = false) {
 }
 
 function serendipity_strftime($format, $timestamp = null, $useOffset = true) {
-    if ($timestamp == null) {
-        $timestamp = serendipity_serverOffsetHour();
-    } elseif ($useOffset) {
-        $timestamp = serendipity_serverOffsetHour($timestamp);
-    }
+    global $serendipity;
+    
+    switch($serendipity['calendar']) {
+        default:
+        case 'gregorian':
+            if ($timestamp == null) {
+                $timestamp = serendipity_serverOffsetHour();
+            } elseif ($useOffset) {
+                $timestamp = serendipity_serverOffsetHour($timestamp);
+            }
+            return strftime($format, $timestamp);
+        
+        case 'jalali-utf8':
+            if ($timestamp == null) {
+                $timestamp = serendipity_serverOffsetHour();
+            } elseif ($useOffset) {
+                $timestamp = serendipity_serverOffsetHour($timestamp);
+            }
 
-    return strftime($format, $timestamp);
+            require_once S9Y_INCLUDE_PATH . 'include/functions_calendars.inc.php';
+            return calendar_jalali_utf($format, $timestamp, $useOffset);
+    }
 }
 
 function serendipity_formatTime($format, $time, $useOffset = true) {

diff --git a/include/functions_calendars.inc.php b/include/functions_calendars.inc.php
new file mode 100644 (file)
index 0000000..53d5574
--- /dev/null
+++ b/include/functions_calendars.inc.php
@@ -0,0 +1,171 @@
+<?php # $Id: functions.inc.php 114 2005-05-22 15:37:11Z garvinhicking $
+# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
+# All rights reserved.  See LICENSE file for licensing details
+
+// Calali UTF Calendar code by Omid Mottaghi
+function calendar_jalali_utf($format, $timestamp, $useOffset) {
+    $g_d=date('j', $timestamp);
+    $g_m=date('n', $timestamp);
+    $g_y=date('Y', $timestamp);
+
+    $g_days_in_month = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+    $j_days_in_month = array(31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29);
+    $j_month_name    = array('', 'فروردین', 'اردیبهشت', 'خرداد', 'تیر',
+                             'مرداد', 'شهریور', 'مهر', 'آبان', 'آذر', 'دی', 'بهمن', 'اسفند');
+    $j_week_name     = array('Saturday'  => 'شنبه',
+                             'Sunday'    => 'یک شنبه',
+                             'Monday'    => 'دوشنبه',
+                             'Tuesday'   => 'سه شنبه',
+                             'Wednesday' => 'چهارشنبه',
+                             'Thursday'  => 'پنج شنبه',
+                             'Friday'    => 'جمعه',
+                             'Sat'       => 'ش',
+                             'Sun'       => 'ی',
+                             'Mon'       => 'د',
+                             'Tue'       => 'س',
+                             'Wed'       => 'چ',
+                             'Thu'       => 'پ',
+                             'Fri'       => 'ج');
+    $j_week_number   = array('Sat' => '1',
+                             'Sun' => '2',
+                             'Mon' => '3',
+                             'Tue' => '4',
+                             'Wed' => '5',
+                             'Thu' => '6',
+                             'Fri' => '7');
+
+    $gy = $g_y-1600;
+    $gm = $g_m-1;
+    $gd = $g_d-1;
+    
+    $g_day_no = 365*$gy+floor(($gy+3)/4)-floor(($gy+99)/100)+floor(($gy+399)/400);
+    
+    for ($i=0; $i < $gm; ++$i) {
+        $g_day_no += $g_days_in_month[$i];
+    }
+
+    if ($gm>1 && (($gy%4==0 && $gy%100!=0) || ($gy%400==0))) {
+        /* leap and after Feb */
+        ++$g_day_no;
+    }
+    
+    $g_day_no += $gd;
+    $j_day_no = $g_day_no-79;
+    $j_np = floor($j_day_no/12053);
+    $j_day_no %= 12053;
+    $jy = 979+33*$j_np+4*floor($j_day_no/1461);
+    $j_day_no %= 1461;
+    
+    if ($j_day_no >= 366) {
+        $jy += floor(($j_day_no-1)/365);
+        $j_day_no = ($j_day_no-1)%365;
+    }
+    $j_all_days = $j_day_no+1;
+    
+    for ($i = 0; $i < 11 && $j_day_no >= $j_days_in_month[$i]; ++$i) {
+        $j_day_no -= $j_days_in_month[$i];
+    }
+    
+    $jm = $i+1;
+    $jd = $j_day_no+1;
+    
+    // calculate string
+    $percent_sign=0;
+    $output_str='';
+    
+    for ($i=0; $i<strlen($format); $i++){
+        switch($format[$i]){
+            case 'a':
+                if($percent_sign){ $output_str.=$j_week_name[date('D', $timestamp)]; $percent_sign=0; }
+                break;
+            case 'A':
+                if($percent_sign){ $output_str.=$j_week_name[date('l', $timestamp)]; $percent_sign=0; }
+                break;
+            case 'b':
+            case 'B':
+            case 'h':
+                if($percent_sign){ $output_str.=$j_month_name[$jm]; $percent_sign=0; }
+                break;
+            case 'c': // incomplete
+                if($percent_sign){ /*$output_str.=$format[$i];*/ $percent_sign=0; }
+                break;
+            case 'C':
+                if($percent_sign){ $output_str.=floor($jy/100); $percent_sign=0; }
+                break;
+            case 'd':
+                if($percent_sign){ $output_str.=$jd; $percent_sign=0; }
+                break;
+            case 'D':
+                if($percent_sign){ $output_str.=$jm.'/'.$jd.'/'.$jy; $percent_sign=0; }
+                break;
+            case 'e':
+                if($percent_sign){ $output_str.=sprintf("%2d", $jm); $percent_sign=0; }
+                break;
+            case 'H':
+                if($percent_sign){ $output_str.=date('H', $timestamp); $percent_sign=0; }
+                break;
+            case 'I':
+                if($percent_sign){ $output_str.=date('h', $timestamp); $percent_sign=0; }
+                break;
+            case 'j':
+                if($percent_sign){ $output_str.=sprintf("%03d", $j_all_days); $percent_sign=0; }
+                break;
+            case 'm':
+                if($percent_sign){ $output_str.=$jm; $percent_sign=0; }
+                break;
+            case 'M':
+                if($percent_sign){ $output_str.=date('i', $timestamp); $percent_sign=0; }
+                break;
+            case 'n':
+                if($percent_sign){ $output_str.="\n"; $percent_sign=0; }
+                break;
+            case 'r':
+            case 'p':
+                if($percent_sign){ if(date('a',$need)=='pm') $output_str.='بعد از ظهر'; else $output_str.='قبل از ظهر'; $percent_sign=0; }
+                break;
+            case 'R': // incomplete
+                if($percent_sign){ /*$output_str.=$format[$i];*/ $percent_sign=0; }
+                break;
+            case 'S':
+                if($percent_sign){ $output_str.=date('s', $timestamp); $percent_sign=0; }
+                break;
+            case 't':
+                if($percent_sign){ $output_str.="\t"; $percent_sign=0; }
+                break;
+            case 'u':
+            case 'U':
+            case 'V':
+            case 'W':
+            case 'w':
+                if($percent_sign){ $output_str.=$j_week_number[date('D', $timestamp)]; $percent_sign=0; }
+                break;
+            case 'x': // incomplete
+                if($percent_sign){ /*$output_str.=$format[$i];*/ $percent_sign=0; }
+                break;
+            case 'X': // incomplete
+                if($percent_sign){ /*$output_str.=$format[$i];*/ $percent_sign=0; }
+                break;
+            case 'y':
+                if($percent_sign){ $output_str.=$jy-(floor($jy/100)*100); $percent_sign=0; }
+                break;
+            case 'g':
+            case 'G':
+            case 'Y':
+                if($percent_sign){ $output_str.=$jy; $percent_sign=0; }
+                break;
+            case 'z':
+            case 'Z': // incomplete
+                if($percent_sign){ /*$output_str.=$format[$i];*/ $percent_sign=0; }
+                break;
+            case '%':
+                if($percent_sign){ $output_str.='%'; } else { $percent_sign=1; }
+                break;
+            default:
+                $output_str.=$format[$i];
+                $percent_sign=0;
+        }
+    }
+    
+    return $output_str;
+}
+?>
\ No newline at end of file

diff --git a/include/tpl/config_local.inc.php b/include/tpl/config_local.inc.php
index 6d917a91bff1550b48f698137128a6b2f769950e..365fc26a1540c3019539594e6389d8800dc57bff 100644 (file)
--- a/include/tpl/config_local.inc.php
+++ b/include/tpl/config_local.inc.php
@@ -283,6 +283,12 @@
                                           'default'     => $serendipity['languages'],
                                           'flags'       => array('simpleInstall')),
 
+                                    array('var'         => 'calendar',
+                                          'title'       => INSTALL_CAL,
+                                          'description' => INSTALL_CAL_DESC,
+                                          'type'        => 'list',
+                                          'default'     => $serendipity['calendars']),
+
                                     array('var'         => 'lang_content_negotiation',
                                           'title'       => AUTOLANG,
                                           'description' => AUTOLANG_DESC,

diff --git a/lang/serendipity_lang_bg.inc.php b/lang/serendipity_lang_bg.inc.php
index cd026b816f79eb3d5eb69c46bc528e7206cc60df..8033ed7c03aff170a537d5c16664f84cf219cfda 100644 (file)
--- a/lang/serendipity_lang_bg.inc.php
+++ b/lang/serendipity_lang_bg.inc.php
@@ -678,6 +678,8 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

diff --git a/lang/serendipity_lang_cn.inc.php b/lang/serendipity_lang_cn.inc.php
index 078c6074af98254b3438d48711283551e263ae61..edbcc51be981fe368ce0b273a7e248ff24aedb63 100644 (file)
--- a/lang/serendipity_lang_cn.inc.php
+++ b/lang/serendipity_lang_cn.inc.php
@@ -692,6 +692,8 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

diff --git a/lang/serendipity_lang_cs.inc.php b/lang/serendipity_lang_cs.inc.php
index 9d118f505c3561398e73c76141e4b03709cbd95a..21db9b5d3e4a2a3aff199d27d202ebd8a4bc927f 100644 (file)
--- a/lang/serendipity_lang_cs.inc.php
+++ b/lang/serendipity_lang_cs.inc.php
@@ -694,6 +694,8 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

diff --git a/lang/serendipity_lang_cz.inc.php b/lang/serendipity_lang_cz.inc.php
index 49b4e6f3737d86c52642171a52bec8030df1bce8..315b006d1150783b8896b0598c99b5ad8f5d6108 100644 (file)
--- a/lang/serendipity_lang_cz.inc.php
+++ b/lang/serendipity_lang_cz.inc.php
@@ -694,6 +694,8 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

diff --git a/lang/serendipity_lang_da.inc.php b/lang/serendipity_lang_da.inc.php
index c5e613dc2dcc42db628d2975c219fcf79000a6a2..74caf15229f41c55cca516bc94c0b7b1e6a6b8f3 100644 (file)
--- a/lang/serendipity_lang_da.inc.php
+++ b/lang/serendipity_lang_da.inc.php
@@ -694,6 +694,8 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

diff --git a/lang/serendipity_lang_de.inc.php b/lang/serendipity_lang_de.inc.php
index 825c0f4fd353adf0361715abd8f37bfbe48e3a4f..88d2f6dd4a7465098a6df1c8dd8e9243c7af4750 100644 (file)
--- a/lang/serendipity_lang_de.inc.php
+++ b/lang/serendipity_lang_de.inc.php
@@ -693,6 +693,8 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

diff --git a/lang/serendipity_lang_en.inc.php b/lang/serendipity_lang_en.inc.php
index c90aef574a7afd366970347aa0903c63e0c1d3c6..00367aaa0faa1111936a811f2dc5ffa26b360c5e 100644 (file)
--- a/lang/serendipity_lang_en.inc.php
+++ b/lang/serendipity_lang_en.inc.php
@@ -691,6 +691,8 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

diff --git a/lang/serendipity_lang_es.inc.php b/lang/serendipity_lang_es.inc.php
index eb703dd1512bc25b1cf222cf36f96ea75ffcb2f8..4a0a077ed64476303552f2cfe286deec584d4c00 100644 (file)
--- a/lang/serendipity_lang_es.inc.php
+++ b/lang/serendipity_lang_es.inc.php
@@ -696,6 +696,8 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

diff --git a/lang/serendipity_lang_fa.inc.php b/lang/serendipity_lang_fa.inc.php
index e5478c270a1d24ad7d2971234e9e98db3bec9c9e..df1ad5a5be55717ca702ff964379fd56f57d98cc 100644 (file)
--- a/lang/serendipity_lang_fa.inc.php
+++ b/lang/serendipity_lang_fa.inc.php
@@ -693,6 +693,8 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

diff --git a/lang/serendipity_lang_fi.inc.php b/lang/serendipity_lang_fi.inc.php
index 43629c5e8451f1a166302a3b89cbc6ae9dcee086..aa4f87eed1aaf6344714726aa0d8b4a0271568ff 100644 (file)
--- a/lang/serendipity_lang_fi.inc.php
+++ b/lang/serendipity_lang_fi.inc.php
@@ -691,6 +691,8 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

diff --git a/lang/serendipity_lang_fr.inc.php b/lang/serendipity_lang_fr.inc.php
index 258c5ef0fbbefaec26b467e7e428695c20df0f05..a9c6a30f0e78a24a2d0aec898efd4cef609dc179 100644 (file)
--- a/lang/serendipity_lang_fr.inc.php
+++ b/lang/serendipity_lang_fr.inc.php
@@ -699,6 +699,8 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

diff --git a/lang/serendipity_lang_is.inc.php b/lang/serendipity_lang_is.inc.php
index fb3d4371f44166521e0df8387d59852281b59cc0..25db49b19827472aa5c633983ff4fe16cbe34302 100644 (file)
--- a/lang/serendipity_lang_is.inc.php
+++ b/lang/serendipity_lang_is.inc.php
@@ -691,6 +691,8 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

diff --git a/lang/serendipity_lang_it.inc.php b/lang/serendipity_lang_it.inc.php
index b71b54508801b8db1fea3c122fe5e234e5e35f06..1b5d03d1190a68274cb9e974383ec471c92d0713 100644 (file)
--- a/lang/serendipity_lang_it.inc.php
+++ b/lang/serendipity_lang_it.inc.php
@@ -693,6 +693,8 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

diff --git a/lang/serendipity_lang_ja.inc.php b/lang/serendipity_lang_ja.inc.php
index 830175005875ba57d018adb281e703e3e3a77d21..2f5529d0cd7865a1ba6dc24ccaf8f80cfc324cf9 100644 (file)
--- a/lang/serendipity_lang_ja.inc.php
+++ b/lang/serendipity_lang_ja.inc.php
@@ -693,6 +693,8 @@ Serendipity のアップグレードステージを無視しました。正し
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

diff --git a/lang/serendipity_lang_ko.inc.php b/lang/serendipity_lang_ko.inc.php
index 9252390b7a07a091a7a50f2d36355ea0b7eb34c8..7e5616e6196e6e440853766eba8a0c8aa27ffc03 100644 (file)
--- a/lang/serendipity_lang_ko.inc.php
+++ b/lang/serendipity_lang_ko.inc.php
@@ -696,6 +696,8 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

diff --git a/lang/serendipity_lang_nl.inc.php b/lang/serendipity_lang_nl.inc.php
index 849f6b4876b0ccd56cd8f797348a587a59b5e67e..2af78235fd78b67c0b2c7f83183babf09e6828ca 100644 (file)
--- a/lang/serendipity_lang_nl.inc.php
+++ b/lang/serendipity_lang_nl.inc.php
@@ -695,6 +695,8 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

diff --git a/lang/serendipity_lang_no.inc.php b/lang/serendipity_lang_no.inc.php
index c92f593c629b3627fb6c5d2d28d2d50b1d88dbf0..94e56d994aacc9481a7a98a27ea57b77c5199a59 100644 (file)
--- a/lang/serendipity_lang_no.inc.php
+++ b/lang/serendipity_lang_no.inc.php
@@ -694,5 +694,7 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 ?>

diff --git a/lang/serendipity_lang_pt.inc.php b/lang/serendipity_lang_pt.inc.php
index 3d35ca5fd654d681e3c165320f0e11890a5c2324..4805055cd00ebbb66ae9474d337c980e5e02bd26 100644 (file)
--- a/lang/serendipity_lang_pt.inc.php
+++ b/lang/serendipity_lang_pt.inc.php
@@ -694,6 +694,8 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

diff --git a/lang/serendipity_lang_ro.inc.php b/lang/serendipity_lang_ro.inc.php
index 85273a1215cbeaf999197cb7bdcce3d8b5408344..a1f4fd1b0bb71cbe893dfe37d6820b96ee3cc8da 100644 (file)
--- a/lang/serendipity_lang_ro.inc.php
+++ b/lang/serendipity_lang_ro.inc.php
@@ -691,6 +691,8 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

diff --git a/lang/serendipity_lang_ru.inc.php b/lang/serendipity_lang_ru.inc.php
index 4dd99c902e2ea94f92162964b184a78cf0c8a72d..b02453ee1302b2d2e6fd953ae105b5cddeb2b40b 100644 (file)
--- a/lang/serendipity_lang_ru.inc.php
+++ b/lang/serendipity_lang_ru.inc.php
@@ -694,6 +694,8 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

diff --git a/lang/serendipity_lang_tn.inc.php b/lang/serendipity_lang_tn.inc.php
index 1b819a328713ddf3e8635d4f778598406d88bcf9..b36fad52555004b13029159de884596e02a668cf 100644 (file)
--- a/lang/serendipity_lang_tn.inc.php
+++ b/lang/serendipity_lang_tn.inc.php
@@ -692,6 +692,8 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

diff --git a/lang/serendipity_lang_tw.inc.php b/lang/serendipity_lang_tw.inc.php
index 4276827520f3f0d5449c4ba08cb05eafd857036e..3c6795aaf8a7a6faea4b25c95ccd587394cf4f07 100644 (file)
--- a/lang/serendipity_lang_tw.inc.php
+++ b/lang/serendipity_lang_tw.inc.php
@@ -692,5 +692,7 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 ?>

diff --git a/lang/serendipity_lang_zh.inc.php b/lang/serendipity_lang_zh.inc.php
index 57718995357e06054f30ddb0009bd5d56e44700c..861a545823729bab23cdfb9af3894caeee58947f 100644 (file)
--- a/lang/serendipity_lang_zh.inc.php
+++ b/lang/serendipity_lang_zh.inc.php
@@ -692,6 +692,8 @@
 @define('INSTALL_PERMALINK_SEARCHPATH', 'Path to search');
 @define('USERCONF_CREATE', 'Forbid creating entries?');
 @define('USERCONF_CREATE_DESC', 'If selected, the user may not create new entries');
+@define('INSTALL_CAL', 'Calendar Type');
+@define('INSTALL_CAL_DESC', 'Choose your desired Calendar format');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index 79144fccf6e7617c0c0d4a3a8328b22fca03811d..04e1beb0f22bed0378979e9da0eccd4ba1eb2233 100644 (file)
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -95,6 +95,10 @@ $serendipity['languages'] = array('en' => 'English',
                                   'ja' => 'Japanese',
                                   'ko' => 'Korean');
 
+/* Available Calendars */
+$serendipity['calendars'] = array('gregorian'   => 'Gregorian',
+                                  'jalali-utf8' => 'Jalali (utf8)');
+
 /*
  *   Load main language file
  */