Project

General

Profile

« Previous | Next » 

Revision 2060

Added by darkviper almost 11 years ago

  1. initialize.php a little fix in handling of languages
    ! modified translation for german language

View differences:

branches/2.8.x/CHANGELOG
11 11
! = Update/Change
12 12
===============================================================================
13 13

  
14
01 Jan-2014 Build 2060 Manuela v.d.Decken(DarkViper)
15
# initialize.php a little fix in handling of languages
16
! modified translation for german language
14 17
01 Jan-2014 Build 2059 Manuela v.d.Decken(DarkViper)
15 18
! update class Wbmailer for use of PHPMailerAutoload
16 19
01 Jan-2014 Build 2058 Manuela v.d.Decken(DarkViper)
branches/2.8.x/wb/admin/interface/version.php
51 51

  
52 52
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
53 53
if(!defined('VERSION')) define('VERSION', '2.8.4');
54
if(!defined('REVISION')) define('REVISION', '2059');
54
if(!defined('REVISION')) define('REVISION', '2060');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/framework/initialize.php
95 95
 */
96 96
	function initCheckValidCaller(array $aCaller)
97 97
	{
98
        return true;
98 99
		$x = debug_backtrace();
99 100
		if(sizeof($x) == 0) {
100 101
			return true;
......
350 351
	}
351 352
// *** end of deprecated part ************************************************************
352 353
// get user language ---
353
	$sRequestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);
354
	// check if get/post value is available
355
	$sTempLanguage = (isset(${$sRequestMethod}['lang']) ? ${$sRequestMethod}['lang'] : '');
356
	// validate language code
357
	if(preg_match('/^[a-z]{2}$/si', $sTempLanguage)) {
358
	// if there's valid get/post
359
		define('LANGUAGE', strtoupper($sTempLanguage));
360
		$_SESSION['LANGUAGE']=LANGUAGE;
361
	}else {
362
		if(isset($_SESSION['LANGUAGE']) && $_SESSION['LANGUAGE']) {
363
		// if there's valid session value
364
			define('LANGUAGE', $_SESSION['LANGUAGE']);
365
		}else {
366
		// otherwise set to default
367
			define('LANGUAGE', DEFAULT_LANGUAGE);
368
		}
369
	}
354
    $sRequestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);
355
    // check if get/post value is available
356
    $sTempLanguage = (isset(${$sRequestMethod}['lang']) ? ${$sRequestMethod}['lang'] : '');
357
    // validate language code
358
    if (preg_match('/^[a-z]{2}$/si', $sTempLanguage)) {
359
    // if there's valid get/post
360
        define('LANGUAGE', strtoupper($sTempLanguage));
361
    } else {
362
        if (!defined('LANGUAGE')) {
363
            if(isset($_SESSION['LANGUAGE']) && $_SESSION['LANGUAGE']) {
364
            // if there's valid session value
365
                define('LANGUAGE', $_SESSION['LANGUAGE']);
366
            } else {
367
            // otherwise set to default
368
                define('LANGUAGE', DEFAULT_LANGUAGE);
369
            }
370
        }
371
    }
372
    $_SESSION['LANGUAGE'] = LANGUAGE;
370 373
// activate translations / load language definitions
371 374
/** begin of deprecated part || will be replaced by class Translate **/	
372 375
// Load Language file
branches/2.8.x/wb/languages/DE.php
293 293
$TEXT['RESULTS_HEADER'] = 'Ergebnisse Überschrift';
294 294
$TEXT['RESULTS_LOOP'] = 'Ergebnisse Schleife';
295 295
$TEXT['RETYPE_NEW_PASSWORD'] = 'Neues Passwort wiederholen';
296
$TEXT['RETYPE_PASSWORD'] = 'Geben Sie bitte Ihr Passwort nochmal ein';
296
$TEXT['RETYPE_PASSWORD'] = 'Passwort wiederholen';
297 297
$TEXT['SAME_WINDOW'] = 'Gleiches Fenster';
298 298
$TEXT['SAVE'] = 'Speichern';
299 299
$TEXT['SEARCH'] = 'Suche';

Also available in: Unified diff