diff options
| author | Filip Komar <filip@mageia.org> | 2012-08-03 10:30:58 +0000 |
|---|---|---|
| committer | Filip Komar <filip@mageia.org> | 2012-08-03 10:30:58 +0000 |
| commit | 851df4f1462cc61f68a1918ba0223a8e32c62aa4 (patch) | |
| tree | f860a4ea695501a9dd5b7c6ae637cbcaef98d6d6 | |
| parent | 771c24ee98fac713a732b71aeaeea09bdf7783a6 (diff) | |
| download | www-851df4f1462cc61f68a1918ba0223a8e32c62aa4.tar www-851df4f1462cc61f68a1918ba0223a8e32c62aa4.tar.gz www-851df4f1462cc61f68a1918ba0223a8e32c62aa4.tar.bz2 www-851df4f1462cc61f68a1918ba0223a8e32c62aa4.tar.xz www-851df4f1462cc61f68a1918ba0223a8e32c62aa4.zip | |
creating subdirectories in lang and patching one error about that
| -rw-r--r-- | en/about/code-of-conduct/index.php | 2 | ||||
| -rw-r--r-- | langs/cs/about/code-of-conduct.cs.lang (renamed from langs/cs/code_of_conduct.cs.lang) | 0 | ||||
| -rw-r--r-- | langs/cs/about/values.cs.lang (renamed from langs/cs/values.cs.lang) | 0 | ||||
| -rw-r--r-- | langs/de/about/code-of-conduct.de.lang (renamed from langs/de/code_of_conduct.de.lang) | 0 | ||||
| -rw-r--r-- | langs/de/about/values.de.lang (renamed from langs/de/values.de.lang) | 0 | ||||
| -rw-r--r-- | langs/en/about/code-of-conduct.en.lang (renamed from langs/en/code_of_conduct.en.lang) | 0 | ||||
| -rw-r--r-- | langs/en/about/values.en.lang (renamed from langs/en/values.en.lang) | 0 | ||||
| -rw-r--r-- | langs/fr/about/code-of-conduct.fr.lang (renamed from langs/fr/code_of_conduct.fr.lang) | 0 | ||||
| -rw-r--r-- | langs/fr/about/values.fr.lang (renamed from langs/fr/values.fr.lang) | 0 | ||||
| -rw-r--r-- | langs/lib.php | 13 | ||||
| -rw-r--r-- | langs/sl/about/code-of-conduct.sl.lang (renamed from langs/sl/code_of_conduct.sl.lang) | 0 | ||||
| -rw-r--r-- | langs/sl/about/values.sl.lang (renamed from langs/sl/values.sl.lang) | 0 | ||||
| -rw-r--r-- | langs/uk/about/code-of-conduct.uk.lang (renamed from langs/uk/code_of_conduct.uk.lang) | 0 | ||||
| -rw-r--r-- | langs/uk/about/values.uk.lang (renamed from langs/uk/values.uk.lang) | 0 |
14 files changed, 13 insertions, 2 deletions
diff --git a/en/about/code-of-conduct/index.php b/en/about/code-of-conduct/index.php index 4d35eabae..faf216140 100644 --- a/en/about/code-of-conduct/index.php +++ b/en/about/code-of-conduct/index.php @@ -1,7 +1,7 @@ <?php define('HLANG', true); require '../../../langs.php'; -_lang_load($locale, 'code_of_conduct'); +_lang_load($locale, 'code-of-conduct'); ?><!DOCTYPE html> <html dir="ltr" lang="<?php echo $locale; ?>"> diff --git a/langs/cs/code_of_conduct.cs.lang b/langs/cs/about/code-of-conduct.cs.lang index 0b9e82591..0b9e82591 100644 --- a/langs/cs/code_of_conduct.cs.lang +++ b/langs/cs/about/code-of-conduct.cs.lang diff --git a/langs/cs/values.cs.lang b/langs/cs/about/values.cs.lang index 917bf0889..917bf0889 100644 --- a/langs/cs/values.cs.lang +++ b/langs/cs/about/values.cs.lang diff --git a/langs/de/code_of_conduct.de.lang b/langs/de/about/code-of-conduct.de.lang index 316e36ca5..316e36ca5 100644 --- a/langs/de/code_of_conduct.de.lang +++ b/langs/de/about/code-of-conduct.de.lang diff --git a/langs/de/values.de.lang b/langs/de/about/values.de.lang index b07b9a894..b07b9a894 100644 --- a/langs/de/values.de.lang +++ b/langs/de/about/values.de.lang diff --git a/langs/en/code_of_conduct.en.lang b/langs/en/about/code-of-conduct.en.lang index 316e36ca5..316e36ca5 100644 --- a/langs/en/code_of_conduct.en.lang +++ b/langs/en/about/code-of-conduct.en.lang diff --git a/langs/en/values.en.lang b/langs/en/about/values.en.lang index b07b9a894..b07b9a894 100644 --- a/langs/en/values.en.lang +++ b/langs/en/about/values.en.lang diff --git a/langs/fr/code_of_conduct.fr.lang b/langs/fr/about/code-of-conduct.fr.lang index ce3b11307..ce3b11307 100644 --- a/langs/fr/code_of_conduct.fr.lang +++ b/langs/fr/about/code-of-conduct.fr.lang diff --git a/langs/fr/values.fr.lang b/langs/fr/about/values.fr.lang index 97b072d82..97b072d82 100644 --- a/langs/fr/values.fr.lang +++ b/langs/fr/about/values.fr.lang diff --git a/langs/lib.php b/langs/lib.php index 81e231673..71b25f1c7 100644 --- a/langs/lib.php +++ b/langs/lib.php @@ -64,9 +64,20 @@ if ( ! function_exists('glob_recursive')) { $files = glob($pattern, $flags); +// removing dirs from $files as they are not files ;) + $files_wo_dirs = array(); + foreach ($files as $single_file) { + $single_file_as_string = str_split($single_file); + $last_sign = array_pop($single_file_as_string); + if($last_sign != '/') { + $files_wo_dirs[] = $single_file; + }; + } + $files = $files_wo_dirs; + foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR|GLOB_NOSORT) as $dir) { - $files = array_merge($files, glob_recursive($dir.'/'.basename($pattern), $flags)); + $files = array_merge($files, glob_recursive($dir.'/'.basename($pattern), $flags)); } return $files; diff --git a/langs/sl/code_of_conduct.sl.lang b/langs/sl/about/code-of-conduct.sl.lang index 6b073bf27..6b073bf27 100644 --- a/langs/sl/code_of_conduct.sl.lang +++ b/langs/sl/about/code-of-conduct.sl.lang diff --git a/langs/sl/values.sl.lang b/langs/sl/about/values.sl.lang index 99cfd4d9f..99cfd4d9f 100644 --- a/langs/sl/values.sl.lang +++ b/langs/sl/about/values.sl.lang diff --git a/langs/uk/code_of_conduct.uk.lang b/langs/uk/about/code-of-conduct.uk.lang index c3fce30d9..c3fce30d9 100644 --- a/langs/uk/code_of_conduct.uk.lang +++ b/langs/uk/about/code-of-conduct.uk.lang diff --git a/langs/uk/values.uk.lang b/langs/uk/about/values.uk.lang index 422061f25..422061f25 100644 --- a/langs/uk/values.uk.lang +++ b/langs/uk/about/values.uk.lang |