Merge pull request #2874 from Hypolite/bug/fix-pgettext-typo
Fix pgettext function name typo
This commit is contained in:
commit
4996003800
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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'))) {
|
||||||
|
|
|
@ -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(
|
||||||
|
|
|
@ -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'),
|
||||||
|
|
Loading…
Reference in a new issue