Fix typo in get_available_languages function name

- Add Doxygen comment block
- Fix formatting
- Renamed variable for faster understanding

diff --git a/include/pgettext.php b/include/pgettext.php
index ea08b4c5cd9eb3f5a8f239b69d26c4212427b4a5..0acbb02cff4f5737b24b2e5bcf87f7e22489cfae 100644 (file)
--- a/include/pgettext.php
+++ b/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;
+}
\ No newline at end of file

diff --git a/mod/admin.php b/mod/admin.php
index c9ff23e2d84c9e1899c0031d25e8585e2f60e3d3..4ddc4a56cdc39485423b9c9ee465cc59a6448ec7 100644 (file)
--- a/mod/admin.php
+++ b/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'))) {

diff --git a/mod/install.php b/mod/install.php
index 1e0d7a5fa527f5d6daef42c3b6792bc0f2c73780..d18d4ac3e29fba1048d431529bbbd9a8f95e439a 100755 (executable)
--- a/mod/install.php
+++ b/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(

diff --git a/mod/settings.php b/mod/settings.php
index 37498a0ddaed8ff3d716e21d6cd001b132c970ea..18d7352d2a251d9ad9ef62e425867681a2aadd70 100644 (file)
--- a/mod/settings.php
+++ b/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'),