Changeset 1520 in ExiteCMS


Ignore:
Timestamp:
07/03/08 16:21:19 (4 years ago)
Author:
hverton
Message:

new language setup field to enable/disable browser language detection (disable = force default language)
introduced a new 'gender' field in the user profile

Location:
trunk
Files:
1 added
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/administration/settings_languages.php

    r1258 r1520  
    2929 
    3030if (isset($_POST['savesettings'])) { 
     31    // use browser language 
     32    $browserlang = (isset($_POST['browserlang']) && IsNum($_POST['browserlang'])) ? $_POST['browserlang'] : 1; 
     33    $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$browserlang."' WHERE cfg_name = 'browserlang'"); 
     34 
     35    // selected default locale 
    3136    $settings['locale'] = stripinput($_POST['localeset']); 
    3237    $old_localeset = stripinput($_POST['old_localeset']); 

  • trunk/administration/tools/language_pack_English.php

    r1502 r1520  
    938938        $localestrings['425'] = "Required when the CMS is installed in a subdirectory of the website document root"; 
    939939        $localestrings['426'] = "Download Panel Layout:"; 
     940        $localestrings['427'] = "Use browser language detection:"; 
    940941        $localestrings['450'] = "Time and Date"; 
    941942        $localestrings['451'] = "Short date format:"; 
    … …  
    32493250        $localestrings['u060'] = "Send Private Message"; 
    32503251        $localestrings['u061'] = "View all posts of this member"; 
     3252        $localestrings['u062'] = "Gender:"; 
     3253        $localestrings['u063'] = "Male"; 
     3254        $localestrings['u064'] = "Female"; 
     3255        $localestrings['u065'] = "Undisclosed"; 
    32513256        $localestrings['u901'] = "Full Name"; 
    32523257        load_localestrings($localestrings, LP_LOCALE, "main.user_fields", $step); 

  • trunk/administration/tools/language_pack_Nederlands.php

    r1502 r1520  
    938938        $localestrings['425'] = "Verplicht indien ExiteCMS is geinstalleerd in een folder van de website document root"; 
    939939        $localestrings['426'] = "Download Paneel Layout:"; 
     940        $localestrings['427'] = "Taalinstelling van de browser:"; 
    940941        $localestrings['450'] = "Datum en tijd"; 
    941942        $localestrings['451'] = "Kort datum formaat:"; 
    … …  
    32493250        $localestrings['u060'] = "Verstuur een privé bericht"; 
    32503251        $localestrings['u061'] = "Bekijk alle berichten van dit lid"; 
     3252        $localestrings['u062'] = "Geslacht:"; 
     3253        $localestrings['u063'] = "Mannelijk"; 
     3254        $localestrings['u064'] = "Vrouwlijk"; 
     3255        $localestrings['u065'] = "Geen opgave"; 
    32513256        $localestrings['u901'] = "Volledige naam"; 
    32523257        load_localestrings($localestrings, LP_LOCALE, "main.user_fields", $step); 

  • trunk/edit_profile.php

    r1413 r1520  
    137137        $user_birthdate = "0000-00-00"; 
    138138    } 
     139    $user_gender = isset($_POST['user_gender']) ? stripinput(trim($_POST['user_gender'])) : ""; 
    139140    $user_aim = isset($_POST['user_aim']) ? stripinput(trim($_POST['user_aim'])) : ""; 
    140141    $user_icq = isset($_POST['user_icq']) ? stripinput(trim($_POST['user_icq'])) : ""; 
    … …  
    186187        } 
    187188        if ($user_newpassword != "") { $newpass = " user_password=md5(md5('$user_newpassword')), "; } else { $newpass = " "; } 
    188         $result = dbquery("UPDATE ".$db_prefix."users SET user_name='$username', user_fullname='$user_fullname', ".$newpass."user_email='".$_POST['user_email']."', user_bad_email = '0', user_hide_email='$user_hide_email', user_location='$user_location', user_birthdate='$user_birthdate', user_aim='$user_aim', user_icq='$user_icq', user_msn='$user_msn', user_yahoo='$user_yahoo', user_web='$user_web', user_forum_fullscreen='$user_forum_fullscreen', user_posts_unread='$user_posts_unread', user_newsletters='$user_newsletters', user_theme='$user_theme', user_offset='$user_offset', ".$set_avatar."user_sig='$user_sig', user_locale='".$_POST['user_locale']."' WHERE user_id='".$this_userdata['user_id']."'"); 
     189        $result = dbquery("UPDATE ".$db_prefix."users SET user_name='$username', user_fullname='$user_fullname', ".$newpass."user_email='".$_POST['user_email']."', user_bad_email = '0', user_hide_email='$user_hide_email', user_location='$user_location', user_birthdate='$user_birthdate', user_gender='$user_gender', user_aim='$user_aim', user_icq='$user_icq', user_msn='$user_msn', user_yahoo='$user_yahoo', user_web='$user_web', user_forum_fullscreen='$user_forum_fullscreen', user_posts_unread='$user_posts_unread', user_newsletters='$user_newsletters', user_theme='$user_theme', user_offset='$user_offset', ".$set_avatar."user_sig='$user_sig', user_locale='".$_POST['user_locale']."' WHERE user_id='".$this_userdata['user_id']."'"); 
    189190        if ($user_theme != $userdata['user_theme']) redirect(FUSION_SELF."?status=1"); 
    190191        $result = dbquery("SELECT * FROM ".$db_prefix."users WHERE user_id='".$this_userdata['user_id']."'"); 

  • trunk/files/locales/en.main.global.php

    r1498 r1520  
    33// locale       : English 
    44// locale name  : main.global 
    5 // generated on : Tue Jul 1 2008, 23:49:35 CEST 
     5// generated on : Thu Jul 3 2008, 16:01:33 CEST 
    66// translators  : ExiteCMS team,WanWizard 
    77// ---------------------------------------------------------- 

  • trunk/includes/locale_functions.php

    r1240 r1520  
    3333 
    3434// locale detection - step 3 - check the browsers accepted languages 
    35 if (!defined('LOCALESET') && isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { 
     35if (!defined('LOCALESET') && isset($settings['browserlang']) && $settings['browserlang'] && isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { 
    3636    // check which languages are supported by the users browser 
    3737    $temp = explode(",", $_SERVER['HTTP_ACCEPT_LANGUAGE']); 

  • trunk/includes/templates/admin.settings_languages.tpl

    r1325 r1520  
    2020    <table align='center' cellpadding='0' cellspacing='0' width='500'> 
    2121        <tr> 
     22            <td width='50%' class='tbl'> 
     23                {$locale.427} 
     24            </td> 
     25            <td width='50%' class='tbl'> 
     26                <select name='browserlang' class='textbox'> 
     27                    <option value='1'{if $settings2.browserlang == 1} selected="selected"{/if}>{$locale.508}</option> 
     28                    <option value='0'{if $settings2.browserlang == 0} selected="selected"{/if}>{$locale.509}</option> 
     29                </select> 
     30            </td> 
     31        </tr> 
    2232            <td width='50%' class='tbl'> 
    2333                {$locale.414} 

  • trunk/includes/templates/main.edit_profile.tpl

    r1280 r1520  
    127127            <td class='tbl'> 
    128128                {html_select_date prefix='user_' time=$this_userdata.user_birthdate start_year="1900" end_year="-1" day_empty="--" month_empty="--" year_empty="--" all_extra="class='textbox'"} 
     129            </td> 
     130        </tr> 
     131        <tr> 
     132            <td class='tbl'> 
     133                {$locale.u062} 
     134            </td> 
     135            <td class='tbl'> 
     136                <select name='user_gender' class='textbox' style='width:200px;'> 
     137                        <option value='' {if $this_userdata.user_gender == ''}selected="selected"{/if}>{$locale.u065}</option> 
     138                        <option value='F' {if $this_userdata.user_gender == 'F'}selected="selected"{/if}>{$locale.u064}</option> 
     139                        <option value='M' {if $this_userdata.user_gender == 'M'}selected="selected"{/if}>{$locale.u063}</option> 
     140                </select> 
    129141            </td> 
    130142        </tr> 

  • trunk/includes/templates/main.profile.members.tpl

    r1159 r1520  
    3838    </tr> 
    3939    <tr> 
    40         <td align='center' width='150' rowspan='6' class='tbl2'> 
     40        <td align='center' width='150' rowspan='7' class='tbl2'> 
    4141        {if $data.user_avatar|default:"" != ""} 
    4242            <img src='{$smarty.const.IMAGES}avatars/{$data.user_avatar}' alt='{$locale.u017}' /> 
    … …  
    7878    <tr> 
    7979        <td width='1%' class='tbl2' style='white-space:nowrap'> 
     80            <b>{$locale.u062}</b> 
     81        </td> 
     82        <td class='tbl2'> 
     83            {if $data.user_gender == "M"} 
     84                {$locale.u063} 
     85            {elseif $data.user_gender == "F"} 
     86                {$locale.u064} 
     87            {else} 
     88                {$locale.u065} 
     89            {/if} 
     90        </td> 
     91    </tr> 
     92    <tr> 
     93        <td width='1%' class='tbl1' style='white-space:nowrap'> 
    8094            <b>{$locale.u011}</b> 
    8195        </td> 
    82         <td class='tbl2'> 
     96        <td class='tbl1'> 
    8397            {$data.user_icq|default:$locale.u048} 
    8498        </td> 
    8599    </tr> 
    86100    <tr> 
    87         <td width='1%' class='tbl1' style='white-space:nowrap'> 
     101        <td width='1%' class='tbl2' style='white-space:nowrap'> 
    88102            <b>{$locale.u012}</b> 
    89103        </td> 
    90         <td class='tbl1'> 
     104        <td class='tbl2'> 
    91105            {$data.user_msn|default:$locale.u048} 
    92106        </td> 
    93107    </tr> 
    94108    <tr> 
    95         <td width='1%' class='tbl2' style='white-space:nowrap'> 
     109        <td width='1%' class='tbl1' style='white-space:nowrap'> 
    96110            <b>{$locale.u013}</b> 
    97111        </td> 
    98         <td class='tbl2'> 
     112        <td class='tbl1'> 
    99113            {$data.user_yahoo|default:$locale.u048} 
    100114        </td> 
    101115    </tr> 
    102116    <tr> 
    103         <td align='center' class='tbl1'> 
     117        <td align='center' class='tbl2'> 
    104118            {if $smarty.const.iSUPERADMIN || $data.user_hide_email != "1"} 
    105119                {buttonlink name=$locale.u051 link="mailto:"|cat:$data.user_email|strip encode='javascript_charcode'}&nbsp; 
    … …  
    112126            {/if} 
    113127        </td> 
    114         <td width='1%' class='tbl1' style='white-space:nowrap'> 
     128        <td width='1%' class='tbl2' style='white-space:nowrap'> 
    115129            <b>{$locale.u021}</b> 
    116130        </td> 
    117         <td class='tbl1'> 
     131        <td class='tbl2'> 
    118132            {$data.user_aim|default:$locale.u048} 
    119133        </td> 
Note: See TracChangeset for help on using the changeset viewer.