OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #19 from Metrax/master

Browse Source 
#4496 PHP 5.3: Timezone settings
This commit is contained in:
Metrax
2012-07-22 16:11:25 -07:00
parent f1beaf329f 00f722f3bd
commit f8b93437b8
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/config2/locale.inc.php
+13
View File
@@ -81,6 +81,7 @@
$opt['locale']['PT']['locales'] = array('pt_PT.utf8', 'pt_PT', 'pt');
$opt['locale']['JA']['locales'] = array('ja_JP.utf8', 'ja_JP', 'jp');
$opt['locale']['EN']['timezone'] = 'Europe/Berlin';
$opt['locale']['EN']['format']['date'] = '%x';
$opt['locale']['EN']['format']['datelong'] = '%d. %B %Y';
$opt['locale']['EN']['format']['datetime'] = '%x %I:%M %p';
@@ -89,6 +90,7 @@
$opt['locale']['EN']['format']['timesec'] = '%X';
$opt['locale']['EN']['country'] = 'UK';
$opt['locale']['DE']['timezone'] = 'Europe/Berlin';
$opt['locale']['DE']['format']['date'] = '%x';
$opt['locale']['DE']['format']['datelong'] = '%d. %B %Y';
$opt['locale']['DE']['format']['datetime'] = '%x %H:%M';
@@ -99,6 +101,7 @@
$opt['locale']['DE']['page']['subtitle1'] = 'Geocaching in Deutschland,';
$opt['locale']['DE']['page']['subtitle2'] = 'Österreich und der Schweiz';
$opt['locale']['FR']['timezone'] = 'Europe/Berlin';
$opt['locale']['FR']['format']['date'] = '%x';
$opt['locale']['FR']['format']['datelong'] = '%d. %B %Y';
$opt['locale']['FR']['format']['datetime'] = '%x %H:%M';
@@ -107,6 +110,7 @@
$opt['locale']['FR']['format']['timesec'] = '%X';
$opt['locale']['FR']['country'] = 'FR';
$opt['locale']['PL']['timezone'] = 'Europe/Berlin';
$opt['locale']['PL']['format']['date'] = '%x';
$opt['locale']['PL']['format']['datelong'] = '%d. %B %Y';
$opt['locale']['PL']['format']['datetime'] = '%x %H:%M';
@@ -115,6 +119,7 @@
$opt['locale']['PL']['format']['timesec'] = '%X';
$opt['locale']['PL']['country'] = 'PL';
$opt['locale']['NL']['timezone'] = 'Europe/Berlin';
$opt['locale']['NL']['format']['date'] = '%x';
$opt['locale']['NL']['format']['datelong'] = '%d. %B %Y';
$opt['locale']['NL']['format']['datetime'] = '%x %H:%M';
@@ -125,6 +130,7 @@
$opt['locale']['NL']['page']['subtitle2'] = '';
$opt['locale']['NL']['country'] = 'NL';
$opt['locale']['IT']['timezone'] = 'Europe/Berlin';
$opt['locale']['IT']['format']['date'] = '%x';
$opt['locale']['IT']['format']['datelong'] = '%d. %B %Y';
$opt['locale']['IT']['format']['datetime'] = '%x %H:%M';
@@ -135,6 +141,7 @@
$opt['locale']['IT']['page']['subtitle1'] = 'Geocaching con Opencaching';
$opt['locale']['IT']['page']['subtitle2'] = '';
$opt['locale']['RU']['timezone'] = 'Europe/Berlin';
$opt['locale']['RU']['format']['date'] = '%x';
$opt['locale']['RU']['format']['datelong'] = '%d. %B %Y';
$opt['locale']['RU']['format']['datetime'] = '%x %H:%M';
@@ -143,6 +150,7 @@
$opt['locale']['RU']['format']['timesec'] = '%X';
$opt['locale']['RU']['country'] = 'RU';
$opt['locale']['ES']['timezone'] = 'Europe/Berlin';
$opt['locale']['ES']['format']['date'] = '%x';
$opt['locale']['ES']['format']['datelong'] = '%d. %B %Y';
$opt['locale']['ES']['format']['datetime'] = '%x %H:%M';
@@ -153,6 +161,7 @@
$opt['locale']['ES']['page']['subtitle1'] = 'Geocaching con Opencaching';
$opt['locale']['ES']['page']['subtitle2'] = '';
$opt['locale']['SV']['timezone'] = 'Europe/Berlin';
$opt['locale']['SV']['format']['date'] = '%Y-%m-%d';
$opt['locale']['SV']['format']['datelong'] = '%Y-%m-%d';
$opt['locale']['SV']['format']['datetime'] = '%x %H:%M';
@@ -163,6 +172,7 @@
$opt['locale']['SV']['page']['subtitle1'] = 'Geocaching med Opencaching';
$opt['locale']['SV']['page']['subtitle2'] = '';
$opt['locale']['NO']['timezone'] = 'Europe/Berlin';
$opt['locale']['NO']['format']['date'] = '%Y-%m-%d';
$opt['locale']['NO']['format']['datelong'] = '%Y-%m-%d';
$opt['locale']['NO']['format']['datetime'] = '%x %H:%M';
@@ -173,6 +183,7 @@
$opt['locale']['NO']['page']['subtitle1'] = 'Geocaching med Opencaching';
$opt['locale']['NO']['page']['subtitle2'] = '';
$opt['locale']['DA']['timezone'] = 'Europe/Berlin';
$opt['locale']['DA']['format']['date'] = '%Y-%m-%d';
$opt['locale']['DA']['format']['datelong'] = '%Y-%m-%d';
$opt['locale']['DA']['format']['datetime'] = '%x %H:%M';
@@ -183,6 +194,7 @@
$opt['locale']['DA']['page']['subtitle1'] = 'Geocaching med Opencaching';
$opt['locale']['DA']['page']['subtitle2'] = '';
$opt['locale']['PT']['timezone'] = 'Europe/Berlin';
$opt['locale']['PT']['format']['date'] = '%Y-%m-%d';
$opt['locale']['PT']['format']['datelong'] = '%Y-%m-%d';
$opt['locale']['PT']['format']['datetime'] = '%x %H:%M';
@@ -193,6 +205,7 @@
$opt['locale']['PT']['page']['subtitle1'] = 'Geocaching com Opencaching';
$opt['locale']['PT']['page']['subtitle2'] = '';
$opt['locale']['JA']['timezone'] = 'Europe/Berlin';
$opt['locale']['JA']['format']['date'] = '%Y-%m-%d';
$opt['locale']['JA']['format']['datelong'] = '%Y-%m-%d';
$opt['locale']['JA']['format']['datetime'] = '%x %H:%M';
htdocs/lib2/common.inc.php
+8 -1
View File
@@ -54,7 +54,7 @@ function __autoload($class_name)
normalize_settings();
set_language();
set_usercountry();
set_timezone();
// set stylepath and langpath
if (isset($opt['template']['style']))
{
@@ -205,6 +205,13 @@ function set_usercountry()
$cookie->set('usercountry', $_REQUEST['usercountry']);
}
function set_timezone()
{
global $opt;
date_default_timezone_set($opt['locale'][$opt['template']['locale']]['timezone']);
}
function fix_magic_quotes_gpc()
{
// Disable magic_quotes_runtime