From 052ba729d7867f411d8cfd3657bcb502d3a4d17e Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 1 Dec 2017 00:35:40 -0500 Subject: [PATCH] Improved translation functions - Add built-in vsprintf to t() - Add built-in sprintf to tt() --- include/pgettext.php | 98 ++++++++--- view/templates/admin_aside.tpl | 47 ----- view/templates/admin_blocklist.tpl | 33 ---- view/templates/admin_deleteitem.tpl | 11 -- view/templates/admin_federation.tpl | 58 ------- view/templates/admin_logs.tpl | 22 --- view/templates/admin_plugins.tpl | 22 --- view/templates/admin_plugins_details.tpl | 37 ---- view/templates/admin_queue.tpl | 25 --- view/templates/admin_settings_features.tpl | 21 --- view/templates/admin_settings_head.tpl | 9 - view/templates/admin_site.tpl | 160 ------------------ view/templates/admin_summary.tpl | 48 ------ view/templates/admin_users.tpl | 155 ----------------- view/templates/admin_viewlogs.tpl | 6 - view/theme/frio/templates/admin_aside.tpl | 85 ---------- .../frost-mobile/templates/admin_aside.tpl | 32 ---- .../frost-mobile/templates/admin_site.tpl | 65 ------- .../frost-mobile/templates/admin_users.tpl | 98 ----------- view/theme/frost/templates/admin_aside.tpl | 32 ---- view/theme/frost/templates/admin_site.tpl | 73 -------- view/theme/frost/templates/admin_users.tpl | 98 ----------- view/theme/quattro/templates/admin_users.tpl | 155 ----------------- 23 files changed, 70 insertions(+), 1320 deletions(-) delete mode 100644 view/templates/admin_aside.tpl delete mode 100644 view/templates/admin_blocklist.tpl delete mode 100644 view/templates/admin_deleteitem.tpl delete mode 100644 view/templates/admin_federation.tpl delete mode 100644 view/templates/admin_logs.tpl delete mode 100644 view/templates/admin_plugins.tpl delete mode 100644 view/templates/admin_plugins_details.tpl delete mode 100644 view/templates/admin_queue.tpl delete mode 100644 view/templates/admin_settings_features.tpl delete mode 100644 view/templates/admin_settings_head.tpl delete mode 100644 view/templates/admin_site.tpl delete mode 100644 view/templates/admin_summary.tpl delete mode 100644 view/templates/admin_users.tpl delete mode 100644 view/templates/admin_viewlogs.tpl delete mode 100644 view/theme/frio/templates/admin_aside.tpl delete mode 100644 view/theme/frost-mobile/templates/admin_aside.tpl delete mode 100644 view/theme/frost-mobile/templates/admin_site.tpl delete mode 100644 view/theme/frost-mobile/templates/admin_users.tpl delete mode 100644 view/theme/frost/templates/admin_aside.tpl delete mode 100644 view/theme/frost/templates/admin_site.tpl delete mode 100644 view/theme/frost/templates/admin_users.tpl delete mode 100644 view/theme/quattro/templates/admin_users.tpl diff --git a/include/pgettext.php b/include/pgettext.php index 2e902a6ab..ae1ce009c 100644 --- a/include/pgettext.php +++ b/include/pgettext.php @@ -120,48 +120,90 @@ function load_translation_table($lang) { }} -// translate string if translation exists - -if (! function_exists('t')) { -function t($s) { - +/** + * @brief Return the localized version of the provided string with optional string interpolation + * + * This function takes a english string as parameter, and if a localized version + * exists for the current language, substitutes it before performing an eventual + * string interpolation (sprintf) with additional optional arguments. + * + * Usages: + * - t('This is an example') + * - t('URL %s returned no result', $url) + * - t('Current version: %s, new version: %s', $current_version, $new_version) + * + * @param string $s + * @return string + */ +function t($s) +{ $a = get_app(); - if (x($a->strings,$s)) { + if (x($a->strings, $s)) { $t = $a->strings[$s]; - return is_array($t)?$t[0]:$t; + $s = is_array($t) ? $t[0] : $t; + } + if (func_num_args() > 1) { + $args = array_slice(func_get_args(), 1); + $s = @vsprintf($s, $args); } - return $s; -}} -if (! function_exists('tt')){ -function tt($singular, $plural, $count){ + return $s; +} + +/** + * @brief Return the localized version of a singular/plural string with optional string interpolation + * + * This function takes two english strings as parameters, singular and plural, as + * well as a count. If a localized version exists for the current language, they + * are used instead. Discrimination between singular and plural is done using the + * localized function if any or the default one. Finally, a string interpolation + * is performed using the count as parameter. + * + * Usages: + * - tt('Like', 'Likes', $count) + * - tt("%s user deleted", "%s users deleted", count($users)) + * + * @global type $lang + * @param string $singular + * @param string $plural + * @param int $count + * @return string + */ +function tt($singular, $plural, $count) +{ global $lang; $a = get_app(); - if (x($a->strings,$singular)) { + if (x($a->strings, $singular)) { $t = $a->strings[$singular]; - $f = 'string_plural_select_' . str_replace('-','_',$lang); - if (! function_exists($f)) - $f = 'string_plural_select_default'; - $k = $f($count); - return is_array($t)?$t[$k]:$t; + if (is_array($t)) { + $plural_function = 'string_plural_select_' . str_replace('-', '_', $lang); + if (function_exists($plural_function)) { + $plural_function = 'string_plural_select_default'; + } + $i = $plural_function($count); + $s = $t[$i]; + } else { + $s = $t; + } + } elseif (string_plural_select_default($count)) { + $s = $plural; + } else { + $s = $singular; } - if ($count!=1){ - return $plural; - } else { - return $singular; - } -}} + $s = @sprintf($s, $count); + + return $s; +} // provide a fallback which will not collide with // a function defined in any language file - -if (! function_exists('string_plural_select_default')) { -function string_plural_select_default($n) { - return ($n != 1); -}} +function string_plural_select_default($n) +{ + return $n != 1; +} diff --git a/view/templates/admin_aside.tpl b/view/templates/admin_aside.tpl deleted file mode 100644 index 5c9cce0d0..000000000 --- a/view/templates/admin_aside.tpl +++ /dev/null @@ -1,47 +0,0 @@ - - -

{{$admtxt}}

- - -{{if $admin.update}} - -{{/if}} - - -{{if $admin.plugins_admin}}

{{$plugadmtxt}}

{{/if}} - - - -

{{$logtxt}}

- - -

{{$diagnosticstxt}}

- diff --git a/view/templates/admin_blocklist.tpl b/view/templates/admin_blocklist.tpl deleted file mode 100644 index 1484c987e..000000000 --- a/view/templates/admin_blocklist.tpl +++ /dev/null @@ -1,33 +0,0 @@ - -
-

{{$title}} - {{$page}}

-

{{$intro}}

-

{{$public}}

- -

{{$addtitle}}

-
- - {{include file="field_input.tpl" field=$newdomain}} - {{include file="field_input.tpl" field=$newreason}} -
-
- - {{if $entries}} -

{{$currenttitle}}

-

{{$currentintro}}

-
- - {{foreach $entries as $e}} - {{include file="field_input.tpl" field=$e.domain}} - {{include file="field_input.tpl" field=$e.reason}} - {{include file="field_checkbox.tpl" field=$e.delete}} - {{/foreach}} -
- {{/if}} -
- -
diff --git a/view/templates/admin_deleteitem.tpl b/view/templates/admin_deleteitem.tpl deleted file mode 100644 index cf819dea6..000000000 --- a/view/templates/admin_deleteitem.tpl +++ /dev/null @@ -1,11 +0,0 @@ -
-

{{$title}} - {{$page}}

-

{{$intro1}}

-

{{$intro2}}

-
- -
- - {{include file="field_input.tpl" field=$deleteitemguid}} -
-
diff --git a/view/templates/admin_federation.tpl b/view/templates/admin_federation.tpl deleted file mode 100644 index ee33df09b..000000000 --- a/view/templates/admin_federation.tpl +++ /dev/null @@ -1,58 +0,0 @@ - - -
-

{{$title}} - {{$page}}

-

{{$intro}}

- {{if not $autoactive}} -

{{$hint}}

- {{/if}} -

{{$legendtext}} -

-

-
- - - -{{foreach $counts as $c}} - {{if $c[0]['total'] > 0}} - - - - - - - - {{/if}} -{{/foreach}} -
{{$c[0]['platform']}}{{$c[0]['total']}} - {{$c[0]['network']}}
- - -
    - {{foreach $c[1] as $v}} -
  • {{if ($c[0]['platform']==='Friendica' and $version===$v['version']) }}{{$v['version']}}{{else}}{{$v['version']}}{{/if}} ({{$v['total']}})
  • - {{/foreach}} -
-
diff --git a/view/templates/admin_logs.tpl b/view/templates/admin_logs.tpl deleted file mode 100644 index b2e6357a9..000000000 --- a/view/templates/admin_logs.tpl +++ /dev/null @@ -1,22 +0,0 @@ -
-

{{$title}} - {{$page}}

- -
- - - {{include file="field_checkbox.tpl" field=$debugging}} - {{include file="field_input.tpl" field=$logfile}} - {{include file="field_select.tpl" field=$loglevel}} - -
- -
- -

{{$phpheader}}

-
-

{{$phplogenabled}}

-

{{$phphint}}

-
{{$phplogcode}}
-
- -
diff --git a/view/templates/admin_plugins.tpl b/view/templates/admin_plugins.tpl deleted file mode 100644 index 75565dd2e..000000000 --- a/view/templates/admin_plugins.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -
-

{{$title}} - {{$page}}

- {{if $pcount eq 0}} -
- {{$noplugshint}} -
- {{else}} - {{$reload}} - - {{/if}} -
diff --git a/view/templates/admin_plugins_details.tpl b/view/templates/admin_plugins_details.tpl deleted file mode 100644 index 9def8fc60..000000000 --- a/view/templates/admin_plugins_details.tpl +++ /dev/null @@ -1,37 +0,0 @@ - -
-

{{$title}} - {{$page}}

- -

{{$info.name}} - {{$info.version}} : {{$action}}

-

{{$info.description}}

- -

{{$str_author}} - {{foreach $info.author as $a}} - {{if $a.link}}{{$a.name}}{{else}}{{$a.name}}{{/if}}, - {{/foreach}} -

- -

{{$str_maintainer}} - {{foreach $info.maintainer as $a}} - {{if $a.link}}{{$a.name}}{{else}}{{$a.name}}{{/if}}, - {{/foreach}} -

- - {{if $screenshot}} - {{$screenshot.1}} - {{/if}} - - {{if $admin_form}} -

{{$settings}}

-
- {{$admin_form}} -
- {{/if}} - - {{if $readme}} -

Readme

-
- {{$readme}} -
- {{/if}} -
diff --git a/view/templates/admin_queue.tpl b/view/templates/admin_queue.tpl deleted file mode 100644 index aaca9b014..000000000 --- a/view/templates/admin_queue.tpl +++ /dev/null @@ -1,25 +0,0 @@ -
-

{{$title}} - {{$page}} ({{$count}})

- -

{{$info}}

- - - - - - - - - - {{foreach $entries as $e}} - - - - - - - - - {{/foreach}} -
{{$id_header}}{{$to_header}}{{$url_header}}{{$network_header}}{{$created_header}}{{$last_header}}
{{$e.id}}{{$e.name}}{{$e.nurl}}{{$e.network}}{{$e.created}}{{$e.last}}
-
diff --git a/view/templates/admin_settings_features.tpl b/view/templates/admin_settings_features.tpl deleted file mode 100644 index abcc527d4..000000000 --- a/view/templates/admin_settings_features.tpl +++ /dev/null @@ -1,21 +0,0 @@ -

{{$title}}

- -
- - -{{foreach $features as $g => $f}} -

{{$f.0}}

- -
- {{foreach $f.1 as $fcat}} - {{include file="field_yesno.tpl" field=$fcat.0}} - {{include file="field_yesno.tpl" field=$fcat.1}} - {{/foreach}} - -
- -
-
-{{/foreach}} - -
diff --git a/view/templates/admin_settings_head.tpl b/view/templates/admin_settings_head.tpl deleted file mode 100644 index 25c0f804e..000000000 --- a/view/templates/admin_settings_head.tpl +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl deleted file mode 100644 index 9f7b3601e..000000000 --- a/view/templates/admin_site.tpl +++ /dev/null @@ -1,160 +0,0 @@ - -
-

{{$title}} - {{$page}}

- -
- - - {{include file="field_input.tpl" field=$sitename}} - {{include file="field_input.tpl" field=$hostname}} - {{include file="field_input.tpl" field=$sender_email}} - {{include file="field_textarea.tpl" field=$banner}} - {{include file="field_input.tpl" field=$shortcut_icon}} - {{include file="field_input.tpl" field=$touch_icon}} - {{include file="field_textarea.tpl" field=$info}} - {{include file="field_select.tpl" field=$language}} - {{include file="field_select.tpl" field=$theme}} - {{include file="field_select.tpl" field=$theme_mobile}} - {{include file="field_select.tpl" field=$ssl_policy}} - {{if $ssl_policy.2 == 1}}{{include file="field_checkbox.tpl" field=$force_ssl}}{{/if}} - {{include file="field_checkbox.tpl" field=$hide_help}} - {{include file="field_select.tpl" field=$singleuser}} -
- -

{{$registration}}

- {{include file="field_input.tpl" field=$register_text}} - {{include file="field_select.tpl" field=$register_policy}} - {{include file="field_input.tpl" field=$daily_registrations}} - {{include file="field_checkbox.tpl" field=$no_multi_reg}} - {{include file="field_checkbox.tpl" field=$no_openid}} - {{include file="field_checkbox.tpl" field=$no_regfullname}} -
- -

{{$upload}}

- {{include file="field_input.tpl" field=$maximagesize}} - {{include file="field_input.tpl" field=$maximagelength}} - {{include file="field_input.tpl" field=$jpegimagequality}} -
- -

{{$corporate}}

- {{include file="field_input.tpl" field=$allowed_sites}} - {{include file="field_input.tpl" field=$allowed_email}} - {{include file="field_checkbox.tpl" field=$block_public}} - {{include file="field_checkbox.tpl" field=$force_publish}} - {{include file="field_select.tpl" field=$community_page_style}} - {{include file="field_input.tpl" field=$max_author_posts_community_page}} - - {{include file="field_checkbox.tpl" field=$ostatus_disabled}} - {{include file="field_checkbox.tpl" field=$ostatus_full_threads}} - - {{if $diaspora_able}} - {{include file="field_checkbox.tpl" field=$diaspora_enabled}} - {{else}} -
- - {{$diaspora_not_able}} -
- {{/if}} - {{include file="field_checkbox.tpl" field=$dfrn_only}} - {{include file="field_input.tpl" field=$global_directory}} -
- {{include file="field_checkbox.tpl" field=$newuser_private}} - {{include file="field_checkbox.tpl" field=$enotify_no_content}} - {{include file="field_checkbox.tpl" field=$private_addons}} - {{include file="field_checkbox.tpl" field=$disable_embedded}} - {{include file="field_checkbox.tpl" field=$allow_users_remote_self}} -
- -

{{$advanced}}

- {{include file="field_select.tpl" field=$rino}} - {{include file="field_checkbox.tpl" field=$verifyssl}} - {{include file="field_input.tpl" field=$proxy}} - {{include file="field_input.tpl" field=$proxyuser}} - {{include file="field_input.tpl" field=$timeout}} - {{include file="field_input.tpl" field=$maxloadavg_frontend}} - {{include file="field_input.tpl" field=$optimize_max_tablesize}} - {{include file="field_input.tpl" field=$optimize_fragmentation}} - {{include file="field_input.tpl" field=$abandon_days}} - {{include file="field_input.tpl" field=$temppath}} - {{include file="field_input.tpl" field=$basepath}} - {{include file="field_checkbox.tpl" field=$suppress_tags}} - {{include file="field_checkbox.tpl" field=$nodeinfo}} - {{include file="field_select.tpl" field=$check_new_version_url}} -
- -

{{$portable_contacts}}

- {{include file="field_checkbox.tpl" field=$poco_completion}} - {{include file="field_input.tpl" field=$poco_requery_days}} - {{include file="field_select.tpl" field=$poco_discovery}} - {{include file="field_select.tpl" field=$poco_discovery_since}} - {{include file="field_checkbox.tpl" field=$poco_local_search}} -
- -

{{$performance}}

- {{include file="field_checkbox.tpl" field=$only_tag_search}} - {{include file="field_input.tpl" field=$itemcache}} - {{include file="field_input.tpl" field=$itemcache_duration}} - {{include file="field_input.tpl" field=$max_comments}} - {{include file="field_checkbox.tpl" field=$proxy_disabled}} -
- -

{{$worker_title}}

- {{include file="field_input.tpl" field=$maxloadavg}} - {{include file="field_input.tpl" field=$min_memory}} - {{include file="field_input.tpl" field=$worker_queues}} - {{include file="field_checkbox.tpl" field=$worker_dont_fork}} - {{include file="field_checkbox.tpl" field=$worker_fastlane}} - {{include file="field_checkbox.tpl" field=$worker_frontend}} -
- -
- - {{* separate form for relocate... *}} -
- -

{{$relocate}}

- {{include file="field_input.tpl" field=$relocate_url}} - -
-
- -
diff --git a/view/templates/admin_summary.tpl b/view/templates/admin_summary.tpl deleted file mode 100644 index e65014413..000000000 --- a/view/templates/admin_summary.tpl +++ /dev/null @@ -1,48 +0,0 @@ - -
-

{{$title}} - {{$page}}

-{{if $showwarning}} -
- {{foreach $warningtext as $wt}} -

{{$wt}}

- {{/foreach}} -
-{{/if}} - -
-
{{$queues.label}}
-
{{$queues.queue}} - {{$queues.workerq}}
-
-
-
{{$pending.0}}
-
{{$pending.1}} -
- -
-
{{$users.0}}
-
{{$users.1}}
-
- {{foreach $accounts as $p}} -
-
{{$p.0}}
-
{{if $p.1}}{{$p.1}}{{else}}0{{/if}}
-
- {{/foreach}} - - -
-
{{$plugins.0}}
- - {{foreach $plugins.1 as $p}} -
{{$p}}
- {{/foreach}} - -
- -
-
{{$version.0}}
-
{{$platform}} '{{$codename}}' {{$version.1}} - {{$build}} -
- - -
diff --git a/view/templates/admin_users.tpl b/view/templates/admin_users.tpl deleted file mode 100644 index a842d6e36..000000000 --- a/view/templates/admin_users.tpl +++ /dev/null @@ -1,155 +0,0 @@ - - -
-

{{$title}} - {{$page}}

- -
- - -

{{$h_pending}}

- {{if $pending}} - - - - {{foreach $th_pending as $th}}{{/foreach}} - - - - - - {{foreach $pending as $u}} - - - - - - - - - - - {{/foreach}} - -
{{$th}}
{{$u.created}}{{$u.name}} - - -

{{$pendingnotetext}}: {{$u.note}}

- -
- {{else}} -

{{$no_pending}}

- {{/if}} - -

{{$h_users}}

- {{if $users}} - - - - - {{foreach $th_users as $th}} - - {{/foreach}} - - - - - - {{foreach $users as $u}} - - - - - - - - - - {{else}} -   - {{/if}} - - - {{/foreach}} - -
- - {{if $order_users == $th.1}} - {{if $order_direction_users == "+"}} - ↓ - {{else}} - ↑ - {{/if}} - {{else}} - ↕ - {{/if}} - {{$th.0}} -
{{$u.nickname}}{{$u.name}}{{$u.register_date}}{{$u.lastitem_date}} - {{if $u.is_deletable}} - - {{if $u.is_deletable}} - - - {{else}} -   - {{/if}} -
- -
- {{else}} - NO USERS?!? - {{/if}} -
- {{if $deleted}} -

{{$h_deleted}}

- - - - - {{foreach $th_deleted as $th}}{{/foreach}} - - - - {{foreach $deleted as $u}} - - - - - - - - - - {{/foreach}} - -
{{$th}}
{{$u.nickname}}{{$u.name}}{{$u.register_date}}{{$u.lastitem_date}}
- {{/if}} -

{{$h_newuser}}

-
- - - - - - - - - - - - - -
{{include file="field_input.tpl" field=$newusername}}
{{include file="field_input.tpl" field=$newusernickname}}
{{include file="field_input.tpl" field=$newuseremail}}
-
-
-
diff --git a/view/templates/admin_viewlogs.tpl b/view/templates/admin_viewlogs.tpl deleted file mode 100644 index c80264c52..000000000 --- a/view/templates/admin_viewlogs.tpl +++ /dev/null @@ -1,6 +0,0 @@ -
-

{{$title}} - {{$page}}

- -

{{$logname}}

-
{{$data}}
-
diff --git a/view/theme/frio/templates/admin_aside.tpl b/view/theme/frio/templates/admin_aside.tpl deleted file mode 100644 index a90ec6916..000000000 --- a/view/theme/frio/templates/admin_aside.tpl +++ /dev/null @@ -1,85 +0,0 @@ - - -
-

{{$admtxt}}

- - - - {{if $admin.update}} - - {{/if}} -
- -{{if $admin.plugins_admin}} -
-

{{$plugadmtxt}}

- -
-{{/if}} - -
-

{{$logtxt}}

- -
- -
-

{{$diagnosticstxt}}

- -
diff --git a/view/theme/frost-mobile/templates/admin_aside.tpl b/view/theme/frost-mobile/templates/admin_aside.tpl deleted file mode 100644 index 74b6cd5f6..000000000 --- a/view/theme/frost-mobile/templates/admin_aside.tpl +++ /dev/null @@ -1,32 +0,0 @@ - - -

{{$admtxt}}

- - -{{if $admin.update}} - -{{/if}} - - -{{if $admin.plugins_admin}}

{{$plugadmtxt}}

{{/if}} - - - -

{{$logtxt}}

- - diff --git a/view/theme/frost-mobile/templates/admin_site.tpl b/view/theme/frost-mobile/templates/admin_site.tpl deleted file mode 100644 index d5b64e58d..000000000 --- a/view/theme/frost-mobile/templates/admin_site.tpl +++ /dev/null @@ -1,65 +0,0 @@ - - -
-

{{$title}} - {{$page}}

- -
- - - {{include file="field_input.tpl" field=$sitename}} - {{include file="field_textarea.tpl" field=$banner}} - {{include file="field_select.tpl" field=$language}} - {{include file="field_select.tpl" field=$theme}} - {{include file="field_select.tpl" field=$theme_mobile}} - {{include file="field_select.tpl" field=$ssl_policy}} - {{include file="field_checkbox.tpl" field=$old_share}} - {{include file="field_checkbox.tpl" field=$hide_help}} - {{include file="field_select.tpl" field=$singleuser}} - -
- -

{{$registration}}

- {{include file="field_input.tpl" field=$register_text}} - {{include file="field_select.tpl" field=$register_policy}} - - {{include file="field_checkbox.tpl" field=$no_multi_reg}} - {{include file="field_checkbox.tpl" field=$no_openid}} - {{include file="field_checkbox.tpl" field=$no_regfullname}} - -
- -

{{$upload}}

- {{include file="field_input.tpl" field=$maximagesize}} - {{include file="field_input.tpl" field=$maximagelength}} - {{include file="field_input.tpl" field=$jpegimagequality}} - -

{{$corporate}}

- {{include file="field_input.tpl" field=$allowed_sites}} - {{include file="field_input.tpl" field=$allowed_email}} - {{include file="field_checkbox.tpl" field=$block_public}} - {{include file="field_checkbox.tpl" field=$force_publish}} - {{include file="field_checkbox.tpl" field=$no_community_page}} - {{include file="field_checkbox.tpl" field=$ostatus_disabled}} - {{include file="field_checkbox.tpl" field=$diaspora_enabled}} - {{include file="field_checkbox.tpl" field=$dfrn_only}} - {{include file="field_input.tpl" field=$global_directory}} - {{include file="field_checkbox.tpl" field=$newuser_private}} - {{include file="field_checkbox.tpl" field=$enotify_no_content}} - {{include file="field_checkbox.tpl" field=$private_addons}} - {{include file="field_checkbox.tpl" field=$disable_embedded}} -
- -

{{$advanced}}

- {{include file="field_checkbox.tpl" field=$verifyssl}} - {{include file="field_input.tpl" field=$proxy}} - {{include file="field_input.tpl" field=$proxyuser}} - {{include file="field_input.tpl" field=$timeout}} - {{include file="field_input.tpl" field=$delivery_interval}} - {{include file="field_input.tpl" field=$poll_interval}} - {{include file="field_input.tpl" field=$maxloadavg}} - {{include file="field_input.tpl" field=$abandon_days}} - -
- -
-
diff --git a/view/theme/frost-mobile/templates/admin_users.tpl b/view/theme/frost-mobile/templates/admin_users.tpl deleted file mode 100644 index f0c4869a7..000000000 --- a/view/theme/frost-mobile/templates/admin_users.tpl +++ /dev/null @@ -1,98 +0,0 @@ - -
-

{{$title}} - {{$page}}

- -
- - -

{{$h_pending}}

- {{if $pending}} - - - - {{foreach $th_pending as $th}}{{/foreach}} - - - - - - {{foreach $pending as $u}} - - - - - - - - {{/foreach}} - -
{{$th}}
{{$u.created}}{{$u.name}} - - -
- -
- {{else}} -

{{$no_pending}}

- {{/if}} - - - - -

{{$h_users}}

- {{if $users}} - - - - - {{foreach $th_users as $th}}{{/foreach}} - - - - - - {{foreach $users as $u}} - - - - - - - - - - {{/if}} - - - {{/foreach}} - -
{{$th}}
{{$u.nickname}}{{$u.name}}{{$u.register_date}}{{$u.lastitem_date}} - {{if $u.is_admin}} -   - {{else}} - - {{if $u.is_admin}} -   - {{else}} - - - {{/if}} -
- -
- {{else}} - NO USERS?!? - {{/if}} -
-
diff --git a/view/theme/frost/templates/admin_aside.tpl b/view/theme/frost/templates/admin_aside.tpl deleted file mode 100644 index 74b6cd5f6..000000000 --- a/view/theme/frost/templates/admin_aside.tpl +++ /dev/null @@ -1,32 +0,0 @@ - - -

{{$admtxt}}

- - -{{if $admin.update}} - -{{/if}} - - -{{if $admin.plugins_admin}}

{{$plugadmtxt}}

{{/if}} - - - -

{{$logtxt}}

- - diff --git a/view/theme/frost/templates/admin_site.tpl b/view/theme/frost/templates/admin_site.tpl deleted file mode 100644 index 8dcfa9129..000000000 --- a/view/theme/frost/templates/admin_site.tpl +++ /dev/null @@ -1,73 +0,0 @@ - - -
-

{{$title}} - {{$page}}

- -
- - - {{include file="field_input.tpl" field=$sitename}} - {{include file="field_textarea.tpl" field=$banner}} - {{include file="field_select.tpl" field=$language}} - {{include file="field_select.tpl" field=$theme}} - {{include file="field_select.tpl" field=$theme_mobile}} - {{include file="field_select.tpl" field=$ssl_policy}} - {{include file="field_checkbox.tpl" field=$old_share}} - {{include file="field_checkbox.tpl" field=$hide_help}} - {{include file="field_select.tpl" field=$singleuser}} - -
- -

{{$registration}}

- {{include file="field_input.tpl" field=$register_text}} - {{include file="field_select.tpl" field=$register_policy}} - {{include file="field_input.tpl" field=$daily_registrations}} - {{include file="field_checkbox.tpl" field=$no_multi_reg}} - {{include file="field_checkbox.tpl" field=$no_openid}} - {{include file="field_checkbox.tpl" field=$no_regfullname}} - -
- -

{{$upload}}

- {{include file="field_input.tpl" field=$maximagesize}} - {{include file="field_input.tpl" field=$maximagelength}} - {{include file="field_input.tpl" field=$jpegimagequality}} - -

{{$corporate}}

- {{include file="field_input.tpl" field=$allowed_sites}} - {{include file="field_input.tpl" field=$allowed_email}} - {{include file="field_checkbox.tpl" field=$block_public}} - {{include file="field_checkbox.tpl" field=$force_publish}} - {{include file="field_checkbox.tpl" field=$no_community_page}} - {{include file="field_checkbox.tpl" field=$ostatus_disabled}} - {{include file="field_checkbox.tpl" field=$diaspora_enabled}} - {{include file="field_checkbox.tpl" field=$dfrn_only}} - {{include file="field_input.tpl" field=$global_directory}} - {{include file="field_checkbox.tpl" field=$newuser_private}} - {{include file="field_checkbox.tpl" field=$enotify_no_content}} - {{include file="field_checkbox.tpl" field=$private_addons}} - {{include file="field_checkbox.tpl" field=$disable_embedded}} -
- -

{{$advanced}}

- {{include file="field_checkbox.tpl" field=$verifyssl}} - {{include file="field_input.tpl" field=$proxy}} - {{include file="field_input.tpl" field=$proxyuser}} - {{include file="field_input.tpl" field=$timeout}} - {{include file="field_input.tpl" field=$delivery_interval}} - {{include file="field_input.tpl" field=$poll_interval}} - {{include file="field_input.tpl" field=$maxloadavg}} - {{include file="field_input.tpl" field=$abandon_days}} - {{include file="field_input.tpl" field=$lockpath}} - {{include file="field_input.tpl" field=$temppath}} - {{include file="field_input.tpl" field=$basepath}} - -

{{$performance}}

- {{include file="field_input.tpl" field=$itemcache}} - {{include file="field_input.tpl" field=$itemcache_duration}} - - -
- -
-
diff --git a/view/theme/frost/templates/admin_users.tpl b/view/theme/frost/templates/admin_users.tpl deleted file mode 100644 index f0c4869a7..000000000 --- a/view/theme/frost/templates/admin_users.tpl +++ /dev/null @@ -1,98 +0,0 @@ - -
-

{{$title}} - {{$page}}

- -
- - -

{{$h_pending}}

- {{if $pending}} - - - - {{foreach $th_pending as $th}}{{/foreach}} - - - - - - {{foreach $pending as $u}} - - - - - - - - {{/foreach}} - -
{{$th}}
{{$u.created}}{{$u.name}} - - -
- -
- {{else}} -

{{$no_pending}}

- {{/if}} - - - - -

{{$h_users}}

- {{if $users}} - - - - - {{foreach $th_users as $th}}{{/foreach}} - - - - - - {{foreach $users as $u}} - - - - - - - - - - {{/if}} - - - {{/foreach}} - -
{{$th}}
{{$u.nickname}}{{$u.name}}{{$u.register_date}}{{$u.lastitem_date}} - {{if $u.is_admin}} -   - {{else}} - - {{if $u.is_admin}} -   - {{else}} - - - {{/if}} -
- -
- {{else}} - NO USERS?!? - {{/if}} -
-
diff --git a/view/theme/quattro/templates/admin_users.tpl b/view/theme/quattro/templates/admin_users.tpl deleted file mode 100644 index ddb395db9..000000000 --- a/view/theme/quattro/templates/admin_users.tpl +++ /dev/null @@ -1,155 +0,0 @@ - - -
-

{{$title}} - {{$page}}

- -
- - -

{{$h_pending}}

- {{if $pending}} - - - - {{foreach $th_pending as $th}}{{/foreach}} - - - - - - {{foreach $pending as $u}} - - - - - - - - - - - {{/foreach}} - -
{{$th}}
{{$u.created}}{{$u.name}} - - -

{{$pendingnotetext}}: {{$u.note}}

- -
- {{else}} -

{{$no_pending}}

- {{/if}} - -

{{$h_users}}

- {{if $users}} - - - - - {{foreach $th_users as $th}} - - {{/foreach}} - - - - - - {{foreach $users as $u}} - - - - - - - - - - {{else}} -   - {{/if}} - - - {{/foreach}} - -
- - {{if $order_users == $th.1}} - {{if $order_direction_users == "+"}} - ↓ - {{else}} - ↑ - {{/if}} - {{else}} - ↕ - {{/if}} - {{$th.0}} -
{{$u.nickname}}{{$u.name}}{{$u.register_date}}{{$u.lastitem_date}} - {{if $u.is_deletable}} - - {{if $u.is_deletable}} - - - {{else}} -   - {{/if}} -
- -
- {{else}} - NO USERS?!? - {{/if}} -
- {{if $deleted}} -

{{$h_deleted}}

- - - - - {{foreach $th_deleted as $th}}{{/foreach}} - - - - {{foreach $deleted as $u}} - - - - - - - - - - {{/foreach}} - -
{{$th}}
{{$u.nickname}}{{$u.name}}{{$u.register_date}}{{$u.lastitem_date}}
- {{/if}} -

{{$h_newuser}}

-
- - - - - - - - - - - - - -
{{include file="field_input.tpl" field=$newusername}}
{{include file="field_input.tpl" field=$newusernickname}}
{{include file="field_input.tpl" field=$newuseremail}}
-
-
-