tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/develop' into 1610-performance

Browse source
This commit is contained in:
Michael 2016-10-27 12:18:45 +00:00
commit 3f0656fdbd
5 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -1104,7 +1104,7 @@ class App {
} }
function save_timestamp($stamp, $value) { function save_timestamp($stamp, $value) {
if (!isset($a->config['system']['profiler']) || !$a->config['system']['profiler']) if (!isset($this->config['system']['profiler']) || !$this->config['system']['profiler'])
return; return;
$duration = (float)(microtime(true)-$stamp); $duration = (float)(microtime(true)-$stamp);

42
include/pgettext.php
View file

@ -162,25 +162,31 @@ function string_plural_select_default($n) {
}} }}
/**
* Return installed languages as associative array
* [
* lang => lang,
* ...
* ]
*/
function get_avaiable_languages() {
$lang_choices = array();
$langs = glob('view/lang/*/strings.php'); /**/
if(is_array($langs) && count($langs)) { /**
if(! in_array('view/lang/en/strings.php',$langs)) * @brief Return installed languages codes as associative array
$langs[] = 'view/lang/en/'; *
asort($langs); * Scans the view/lang directory for the existence of "strings.php" files, and
foreach($langs as $l) { * returns an alphabetical list of their folder names (@-char language codes).
$t = explode("/",$l); * Adds the english language if it's missing from the list.
$lang_choices[$t[2]] = $t[2]; *
* Ex: array('de' => 'de', 'en' => 'en', 'fr' => 'fr', ...)
*
* @return array
*/
function get_available_languages() {
$langs = array();
$strings_file_paths = glob('view/lang/*/strings.php');
if (is_array($strings_file_paths) && count($strings_file_paths)) {
if (!in_array('view/lang/en/strings.php', $strings_file_paths)) {
$strings_file_paths[] = 'view/lang/en/strings.php';
}
asort($strings_file_paths);
foreach($strings_file_paths as $strings_file_path) {
$path_array = explode('/', $strings_file_path);
$langs[$path_array[2]] = $path_array[2];
} }
} }
return $lang_choices; return $langs;
} }

2
mod/admin.php
View file

@ -820,7 +820,7 @@ function admin_page_site_post(&$a) {
function admin_page_site(&$a) { function admin_page_site(&$a) {
/* Installed langs */ /* Installed langs */
$lang_choices = get_avaiable_languages(); $lang_choices = get_available_languages();
if(strlen(get_config('system','directory_submit_url')) AND if(strlen(get_config('system','directory_submit_url')) AND
!strlen(get_config('system','directory'))) { !strlen(get_config('system','directory'))) {

2
mod/install.php
View file

@ -285,7 +285,7 @@ function install_content(&$a) {
$adminmail = notags(trim($_POST['adminmail'])); $adminmail = notags(trim($_POST['adminmail']));
$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles'); $timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
/* Installed langs */ /* Installed langs */
$lang_choices = get_avaiable_languages(); $lang_choices = get_available_languages();
$tpl = get_markup_template('install_settings.tpl'); $tpl = get_markup_template('install_settings.tpl');
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(

2
mod/settings.php
View file

@ -1251,7 +1251,7 @@ function settings_content(&$a) {
$public_post_link = '&public=1'; $public_post_link = '&public=1';
/* Installed langs */ /* Installed langs */
$lang_choices = get_avaiable_languages(); $lang_choices = get_available_languages();
$o .= replace_macros($stpl, array( $o .= replace_macros($stpl, array(
'$ptitle' => t('Account Settings'), '$ptitle' => t('Account Settings'),