Changeset 8626

Timestamp:

Jan 12, 2011, 2:41:55 PM (13 years ago)

Author:

plg

Message:

feature 2103 added: week may start on sunday/monday in the monthly calendar

Location:

trunk

Files:

• admin/configuration.php (modified) (1 diff)
• admin/themes/default/template/configuration.tpl (modified) (1 diff)
• include/calendar_monthly.class.php (modified) (3 diffs)
• install/config.sql (modified) (1 diff)
• install/db/93-database.php (added)
• language/en_UK/admin.lang.php (modified) (1 diff)
• language/fr_FR/admin.lang.php (modified) (1 diff)

trunk/admin/configuration.php

@@ -247 +247 @@
         'CONF_PAGE_BANNER' => htmlspecialchars($conf['page_banner']),
         'CONF_GALLERY_URL' => $conf['gallery_url'],
+        'week_starts_on_options' => array(
+          'sunday' => $lang['day'][0],
+          'monday' => $lang['day'][1],
+          ),
+        'week_starts_on_options_selected' => $conf['week_starts_on'],
         ));
 

trunk/admin/themes/default/template/configuration.tpl

@@ -86 +86 @@
         <span class="property">{'Email admins when a new user registers'|@translate}</span>
         <input type="checkbox" name="email_admin_on_new_user" {if ($main.email_admin_on_new_user)}checked="checked"{/if}>
+      </label>
+    </li>
+
+    <li>
+      <label>
+        <span class="property">
+          {'Week starts on'|@translate}
+          {html_options name="week_starts_on" options=$main.week_starts_on_options selected=$main.week_starts_on_options_selected}
+        </span>
       </label>
     </li>

trunk/include/calendar_monthly.class.php

@@ -331 +331 @@
 function build_month_calendar(&$tpl_var)
 {
-  global $page;
+  global $page, $lang, $conf;
 
   $query='SELECT '.pwg_db_get_dayofmonth($this->date_field).' as period,
@@ -369 +369 @@
     $items[$day]['height'] = $row['height'];
     $items[$day]['dow'] = $row['dow'];
-  }
-
-  global $lang, $conf;
+
+    if ('sunday' == $conf['week_starts_on'])
+    {
+      $items[$day]['dow']++;
+    }
+  }
 
   if ( !empty($items)
@@ -396 +399 @@
       $first_day_dow -= 1;
     }
-    array_push( $wday_labels, array_shift($wday_labels) );
+
+    if ('monday' == $conf['week_starts_on'])
+    {
+      array_push( $wday_labels, array_shift($wday_labels) );
+    }
     // END - pass now in week starting Monday
 

trunk/install/config.sql

@@ -52 +52 @@
     'Information displayed on picture page'
   );
+INSERT INTO piwigo_config (param,value,comment) VALUES ('week_starts_on','monday','Monday may not be the first day of the week');

trunk/language/en_UK/admin.lang.php

@@ -800 +800 @@
 $lang['with no album'] = 'with no album';
 $lang['with no tag'] = 'with no tag';
+$lang['Week starts on'] = 'Week starts on';
 ?>

trunk/language/fr_FR/admin.lang.php

@@ -804 +804 @@
 $lang['with no album'] = 'sans album';
 $lang['with no tag'] = 'sans tag';
+$lang['Week starts on'] = 'La semaine commence le';
 ?>