diff options
| -rw-r--r-- | Zotlabs/Lib/Techlevels.php | 21 | ||||
| -rw-r--r-- | Zotlabs/Module/Admin/Account_edit.php | 20 | ||||
| -rw-r--r-- | Zotlabs/Module/Settings/Account.php | 10 | ||||
| -rw-r--r-- | include/language.php | 58 | ||||
| -rw-r--r-- | include/text.php | 36 | ||||
| -rw-r--r-- | view/en-au/hstrings.php | 5 | ||||
| -rw-r--r-- | view/en-gb/hstrings.php | 31 | ||||
| -rw-r--r-- | view/tpl/admin_account_edit.tpl | 9 |
8 files changed, 145 insertions, 45 deletions
diff --git a/Zotlabs/Lib/Techlevels.php b/Zotlabs/Lib/Techlevels.php new file mode 100644 index 000000000..6a8c36fb3 --- /dev/null +++ b/Zotlabs/Lib/Techlevels.php @@ -0,0 +1,21 @@ +<?php + +namespace Zotlabs\Lib; + + +class Techlevels { + + static public function levels() { + $techlevels = [ + '0' => t('Beginner/Basic'), + '1' => t('Novice - not skilled but willing to learn'), + '2' => t('Intermediate - somewhat comfortable'), + '3' => t('Advanced - very comfortable'), + '4' => t('Expert - I can write computer code'), + '5' => t('Wizard - I probably know more than you do') + ]; + return $techlevels; + } + +} + diff --git a/Zotlabs/Module/Admin/Account_edit.php b/Zotlabs/Module/Admin/Account_edit.php index ddb7e19f4..6dfadf183 100644 --- a/Zotlabs/Module/Admin/Account_edit.php +++ b/Zotlabs/Module/Admin/Account_edit.php @@ -29,6 +29,22 @@ class Account_edit { info( sprintf( t('Password changed for account %d.'), $account_id). EOL); } + + $service_class = trim($_REQUEST['service_class']); + $account_level = intval(trim($_REQUEST['account_level'])); + $account_language = trim($_REQUEST['account_language']); + + $r = q("update account set account_service_class = '%s', account_level = %d, account_language = '%s' + where account_id = %d", + dbesc($service_class), + intval($account_level), + dbesc($account_language), + intval($account_id) + ); + + if($r) + info( t('Account settings updated.') . EOL); + goaway(z_root() . '/admin/accounts'); } @@ -46,11 +62,15 @@ class Account_edit { return ''; } + $a = replace_macros(get_markup_template('admin_account_edit.tpl'), [ '$account' => $x[0], '$title' => t('Account Edit'), '$pass1' => [ 'pass1', t('New Password'), ' ','' ], '$pass2' => [ 'pass2', t('New Password again'), ' ','' ], + '$account_level' => [ 'account_level', t('Technical skill level'), $x[0]['account_level'], '', \Zotlabs\Lib\Techlevels::levels() ], + '$account_language' => [ 'account_language' , t('Account language (for emails)'), $x[0]['account_language'], '', language_list() ], + '$service_class' => [ 'service_class', t('Service class'), $x[0]['account_service_class'], '' ], '$submit' => t('Submit'), ] ); diff --git a/Zotlabs/Module/Settings/Account.php b/Zotlabs/Module/Settings/Account.php index cd5ed1fca..ec176797d 100644 --- a/Zotlabs/Module/Settings/Account.php +++ b/Zotlabs/Module/Settings/Account.php @@ -101,15 +101,7 @@ class Account { $email = \App::$account['account_email']; - $techlevels = [ - '0' => t('Beginner/Basic'), - '1' => t('Novice - not skilled but willing to learn'), - '2' => t('Intermediate - somewhat comfortable'), - '3' => t('Advanced - very comfortable'), - '4' => t('Expert - I can write computer code'), - '5' => t('Wizard - I probably know more than you do') - ]; - + $techlevels = \Zotlabs\Lib\Techlevels::levels(); $def_techlevel = \App::$account['account_level']; $techlock = get_config('system','techlevel_lock'); diff --git a/include/language.php b/include/language.php index 96d3e48a9..efe9397fb 100644 --- a/include/language.php +++ b/include/language.php @@ -327,3 +327,61 @@ function get_language_name($s, $l = null) { return $language->getName(); } + + + +function language_list() { + + $langs = glob('view/*/hstrings.php'); + + $lang_options = array(); + $selected = ""; + + if(is_array($langs) && count($langs)) { + if(! in_array('view/en/hstrings.php',$langs)) + $langs[] = 'view/en/'; + asort($langs); + foreach($langs as $l) { + $ll = substr($l,5); + $ll = substr($ll,0,strrpos($ll,'/')); + $lang_options[$ll] = get_language_name($ll, $ll) . " ($ll)"; + } + } + return $lang_options; +} + +function lang_selector() { + + $langs = glob('view/*/hstrings.php'); + + $lang_options = array(); + $selected = ""; + + if(is_array($langs) && count($langs)) { + $langs[] = ''; + if(! in_array('view/en/hstrings.php',$langs)) + $langs[] = 'view/en/'; + asort($langs); + foreach($langs as $l) { + if($l == '') { + $lang_options[""] = t('default'); + continue; + } + $ll = substr($l,5); + $ll = substr($ll,0,strrpos($ll,'/')); + $selected = (($ll === App::$language && (x($_SESSION, 'language'))) ? $ll : $selected); + $lang_options[$ll] = get_language_name($ll, $ll) . " ($ll)"; + } + } + + $tpl = get_markup_template('lang_selector.tpl'); + + $o = replace_macros($tpl, array( + '$title' => t('Select an alternate language'), + '$langs' => array($lang_options, $selected), + + )); + + return $o; +} + diff --git a/include/text.php b/include/text.php index 9c4a4a5c5..2f89d3d98 100644 --- a/include/text.php +++ b/include/text.php @@ -1837,42 +1837,6 @@ function mimetype_select($channel_id, $current = 'text/bbcode') { return $o; } - -function lang_selector() { - - $langs = glob('view/*/hstrings.php'); - - $lang_options = array(); - $selected = ""; - - if(is_array($langs) && count($langs)) { - $langs[] = ''; - if(! in_array('view/en/hstrings.php',$langs)) - $langs[] = 'view/en/'; - asort($langs); - foreach($langs as $l) { - if($l == '') { - $lang_options[""] = t('default'); - continue; - } - $ll = substr($l,5); - $ll = substr($ll,0,strrpos($ll,'/')); - $selected = (($ll === App::$language && (x($_SESSION, 'language'))) ? $ll : $selected); - $lang_options[$ll] = get_language_name($ll, $ll) . " ($ll)"; - } - } - - $tpl = get_markup_template("lang_selector.tpl"); - $o = replace_macros($tpl, array( - '$title' => t('Select an alternate language'), - '$langs' => array($lang_options, $selected), - - )); - - return $o; -} - - function engr_units_to_bytes ($size_str) { if(! $size_str) return $size_str; diff --git a/view/en-au/hstrings.php b/view/en-au/hstrings.php new file mode 100644 index 000000000..95f8c4e00 --- /dev/null +++ b/view/en-au/hstrings.php @@ -0,0 +1,5 @@ +<?php +require_once('view/en-gb/strings.php'); +App::$strings['Welcome %s. Remote authentication successful.'] = "G'day %s. Remote authentication successful"; + + diff --git a/view/en-gb/hstrings.php b/view/en-gb/hstrings.php new file mode 100644 index 000000000..e856c1af9 --- /dev/null +++ b/view/en-gb/hstrings.php @@ -0,0 +1,31 @@ +<?php +App::$strings["Set shadow color, default #000"] = "Set shadow colour, default #000"; +App::$strings["Set background color"] = "Set background colour"; +App::$strings["Set section background color"] = "Set section background colour"; +App::$strings["Set color of items - use hex"] = "Set colour of items - use hex"; +App::$strings["Set color of links - use hex"] = "Set colour of links - use hex"; +App::$strings["Set color of fonts - use hex"] = "Set colour of fonts - use hex"; +App::$strings["Navigation bar background color"] = "Navigation bar background colour"; +App::$strings["Navigation bar gradient top color"] = "Navigation bar gradient top colour"; +App::$strings["Navigation bar gradient bottom color"] = "Navigation bar gradient bottom colour"; +App::$strings["Navigation active button gradient top color"] = "Navigation active button gradient top colour"; +App::$strings["Navigation active button gradient bottom color"] = "Navigation active button gradient bottom colour"; +App::$strings["Navigation bar border color "] = "Navigation bar border colour "; +App::$strings["Navigation bar icon color "] = "Navigation bar icon colour "; +App::$strings["Navigation bar active icon color "] = "Navigation bar active icon colour "; +App::$strings["link color"] = "link colour"; +App::$strings["Set font-color for banner"] = "Set font-colour for banner"; +App::$strings["Set the background color"] = "Set the background colour"; +App::$strings["Set the background color of items"] = "Set the background colour of items"; +App::$strings["Set the background color of comments"] = "Set the background colour of comments"; +App::$strings["Set the border color of comments"] = "Set the border colour of comments"; +App::$strings["Set the basic color for item icons"] = "Set the basic colour for item icons"; +App::$strings["Set the hover color for item icons"] = "Set the hover colour for item icons"; +App::$strings["Set font-color for posts and comments"] = "Set font-colour for posts and comments"; +App::$strings["Authorize application connection"] = "Authorise application connection"; +App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Do you want to authorise this application to access your posts and contacts, and/or create new posts for you?"; +App::$strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "If your certificate is not recognised, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."; +App::$strings["This is a hub of the Hubzilla - a global cooperative network of decentralized privacy enhanced websites."] = "This is a hub of the Hubzilla - a global cooperative network of decentralised privacy enhanced websites."; +App::$strings["You are cordially invited to join me and some other close friends on the Hubzilla - a revolutionary new decentralized communication and information tool."] = "You are cordially invited to join me and some other close friends on the Hubzilla - a revolutionary new decentralised communication and information tool."; +App::$strings["l F d, Y \\@ g:i A"] = "l j F, Y \\@ G:i"; +App::$strings["D, d M Y - g:i A"] = "D, d M Y - G:i"; diff --git a/view/tpl/admin_account_edit.tpl b/view/tpl/admin_account_edit.tpl index 5e8cb5f47..82d137de4 100644 --- a/view/tpl/admin_account_edit.tpl +++ b/view/tpl/admin_account_edit.tpl @@ -9,6 +9,15 @@ {{include file="field_password.tpl" field=$pass1}} {{include file="field_password.tpl" field=$pass2}} +{{if $z_server_role == 'pro'}} +{{include file="field_select.tpl" field=$account_level}} +{{else}} +<input type="hidden" name="account_level" value="{{$account_level.2}}" /> +{{/if}} +{{include file="field_select.tpl" field=$account_language}} +{{include file="field_input.tpl" field=$service_class}} + + <input type="submit" name="submit" value="{{$submit}}" /> </form> |