Преглед на файлове

Fix typo in get_available_languages function name

- Add Doxygen comment block
- Fix formatting
- Renamed variable for faster understanding
tags/3.5.1
Hypolite Petovan преди 4 години
родител
ревизия
2fc2a1a228
променени са 4 файла, в които са добавени 27 реда и са изтрити 21 реда
  1. +24
    -18
      include/pgettext.php
  2. +1
    -1
      mod/admin.php
  3. +1
    -1
      mod/install.php
  4. +1
    -1
      mod/settings.php

+ 24
- 18
include/pgettext.php Целия файл

@@ -162,25 +162,31 @@ function string_plural_select_default($n) {
}}



/**
* Return installed languages as associative array
* [
* lang => lang,
* ...
* ]
* @brief Return installed languages codes as associative array
*
* Scans the view/lang directory for the existence of "strings.php" files, and
* returns an alphabetical list of their folder names (@-char language codes).
* Adds the english language if it's missing from the list.
*
* Ex: array('de' => 'de', 'en' => 'en', 'fr' => 'fr', ...)
*
* @return array
*/
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))
$langs[] = 'view/lang/en/';
asort($langs);
foreach($langs as $l) {
$t = explode("/",$l);
$lang_choices[$t[2]] = $t[2];
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;
}

+ 1
- 1
mod/admin.php Целия файл

@@ -820,7 +820,7 @@ function admin_page_site_post(&$a) {
function admin_page_site(&$a) {

/* Installed langs */
$lang_choices = get_avaiable_languages();
$lang_choices = get_available_languages();

if(strlen(get_config('system','directory_submit_url')) AND
!strlen(get_config('system','directory'))) {


+ 1
- 1
mod/install.php Целия файл

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

$tpl = get_markup_template('install_settings.tpl');
$o .= replace_macros($tpl, array(


+ 1
- 1
mod/settings.php Целия файл

@@ -1246,7 +1246,7 @@ function settings_content(&$a) {
$public_post_link = '&public=1';

/* Installed langs */
$lang_choices = get_avaiable_languages();
$lang_choices = get_available_languages();

$o .= replace_macros($stpl, array(
'$ptitle' => t('Account Settings'),


Зареждане…
Отказ
Запис