Project

General

Profile

« Previous | Next » 

Revision 1845

Added by Dietmar almost 12 years ago

  1. bugfix redclare function in preferences_form
    ! add infobox, if you have to change the language before working in preferences

View differences:

branches/2.8.x/CHANGELOG
12 12
===============================================================================
13 13

  
14 14

  
15
28 Dez-2012 Build 1845 Dietmar Woellbrink (Luisehahne)
16
# bugfix redclare function in preferences_form
17
! add infobox, if you have to change the language before working in preferences
15 18
28 Dez-2012 Build 1844 Dietmar Woellbrink (Luisehahne)
16 19
# fixed Use of undefined constant PAGE_ID in /account/forgot.php
17 20
! change return value to boolean in user management delete.php, add.php
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.3');
54
if(!defined('REVISION')) define('REVISION', '1844');
54
if(!defined('REVISION')) define('REVISION', '1845');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/account/htt/preferences.htt
68 68
            </tr>
69 69
            <tr>
70 70
                <td colspan="2" class="button">
71
				 <p class="note" style="{DISPLAY_PREFERENCES_LANGUAGE}">{MOD_PREFERENCE_SET_PREFERENCES_LANGUAGE}</p>
71 72
        <!-- BEGIN show_detail_send_block -->
72 73
                    <button class="error" type="reset" name="reset" value="reset">{TEXT_RESET}</button>
73 74
                    <button type="submit" name="action" value="details">{MOD_PREFERENCE_SAVE_SETTINGS}</button>
branches/2.8.x/wb/account/languages/EN.php
29 29
	'SAVE_SETTINGS' => 'save details',
30 30
	'SAVE_EMAIL'    => 'save email',
31 31
	'SAVE_PASSWORD' => 'save password',
32
	'SAVE_LANGUAGE' => 'Switch language first',
32
	'SAVE_LANGUAGE' => 'Switch language',
33
	'SET_PREFERENCES_LANGUAGE' => 'Settings are possible only in your linguistic setting! You first have to change the language and start the settings anew!',
33 34
);
34 35
$TEXT['USERNAME'] = 'Loginname';
35 36
$HEADING['SIGNUP2_CONFIMED_REGISTRATION'] = 'Unlock account';
branches/2.8.x/wb/account/languages/DE.php
32 32
	'SAVE_SETTINGS' => 'Einstellungen speichern',
33 33
	'SAVE_EMAIL' => 'Email speichern',
34 34
	'SAVE_PASSWORD' => 'Passwort speichern',
35
	'SAVE_LANGUAGE' => 'Zuerst die Sprache wechseln',
35
	'SAVE_LANGUAGE' => 'Sprache wechseln',
36
	'SET_PREFERENCES_LANGUAGE' => 'Einstellungen sind nur in Ihrer Spracheinstellung möglich! Sie müssen zuerst die Sprache wechseln und die Einstellungen neu aufrufen!',
36 37
);
37 38

  
38 39
$HEADING['SIGNUP2_CONFIMED_REGISTRATION'] = 'Kontofreischaltung';
branches/2.8.x/wb/account/preferences_form.php
52 52
// load module default language file (EN)
53 53
require($sLanguageFile);
54 54

  
55
require(WB_PATH.'/framework/functions-utf8.php');
55
if(!function_exists('utf8_check')) { require(WB_PATH.'/framework/functions-utf8.php'); }
56 56

  
57 57
$sIncludeHeadLinkCss = '';
58 58
if( is_readable(WB_PATH .'/account/frontend.css')) {
......
125 125
    $template->parse('show_password_send', 'show_password_send_block');
126 126
}
127 127

  
128
// Insert language text and messages
128
// Insert language text and messages visibilty="hidden"
129 129
$template->set_var(array(
130 130
    'HTTP_REFERER' => ( $wb->get_session('HTTP_REFERER')!='' ? $_SESSION['HTTP_REFERER'] : WB_URL),
131 131
    'CSS_BLOCK'	=> $sIncludeHeadLinkCss,
132 132
    'TEXT_SAVE'	=> $TEXT['SAVE'],
133 133
    'TEXT_RESET' => $TEXT['RESET'],
134 134
    'TEXT_CANCEL' => ($sUserLanguage!=LANGUAGE) ? $MOD_PREFERENCE['SAVE_LANGUAGE']:$TEXT['CANCEL'],
135
    'TEXT_DISPLAY_NAME'	=> $TEXT['DISPLAY_NAME'],
135
    'MOD_PREFERENCE_SET_PREFERENCES_LANGUAGE' => ($sUserLanguage!=LANGUAGE) ? $MOD_PREFERENCE['SET_PREFERENCES_LANGUAGE']:'',
136
    'DISPLAY_PREFERENCES_LANGUAGE' => ($sUserLanguage!=LANGUAGE) ? '':'display:none',
137
	'TEXT_DISPLAY_NAME'	=> $TEXT['DISPLAY_NAME'],
136 138
    'TEXT_EMAIL' => $TEXT['EMAIL'],
137 139
    'TEXT_LANGUAGE' => $TEXT['LANGUAGE'],
138 140
    'TEXT_TIMEZONE' => $TEXT['TIMEZONE'],

Also available in: Unified diff