diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-05-25 13:26:05 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2017-10-22 13:16:53 +0200 |
commit | f39580c6fd171b849cec5832b4912182696341f2 (patch) | |
tree | c184380d829e2f9b22b2375f4bdc8d085cd6a9be /application | |
parent | d6379763290230242caac5fe1e7c589a29fa6bf0 (diff) | |
download | Shaarli-f39580c6fd171b849cec5832b4912182696341f2.tar.gz Shaarli-f39580c6fd171b849cec5832b4912182696341f2.tar.zst Shaarli-f39580c6fd171b849cec5832b4912182696341f2.zip |
Add language selection in the configure page of the default theme
Diffstat (limited to 'application')
-rw-r--r-- | application/Languages.php | 16 | ||||
-rw-r--r-- | application/NetscapeBookmarkUtils.php | 1 |
2 files changed, 15 insertions, 2 deletions
diff --git a/application/Languages.php b/application/Languages.php index 4ba32f29..357c7524 100644 --- a/application/Languages.php +++ b/application/Languages.php | |||
@@ -62,7 +62,7 @@ class Languages | |||
62 | /** | 62 | /** |
63 | * Languages constructor. | 63 | * Languages constructor. |
64 | * | 64 | * |
65 | * @param string $language lang determined by autoLocale(), can be override. | 65 | * @param string $language lang determined by autoLocale(), can be overridden. |
66 | * @param ConfigManager $conf instance. | 66 | * @param ConfigManager $conf instance. |
67 | */ | 67 | */ |
68 | public function __construct($language, $conf) | 68 | public function __construct($language, $conf) |
@@ -147,4 +147,18 @@ class Languages | |||
147 | { | 147 | { |
148 | return preg_match('/^[a-z]{2}(_[A-Z]{2})?/', $language) === 1; | 148 | return preg_match('/^[a-z]{2}(_[A-Z]{2})?/', $language) === 1; |
149 | } | 149 | } |
150 | |||
151 | /** | ||
152 | * Get the list of available languages for Shaarli. | ||
153 | * | ||
154 | * @return array List of available languages, with their label. | ||
155 | */ | ||
156 | public static function getAvailableLanguages() | ||
157 | { | ||
158 | return [ | ||
159 | 'auto' => t('Automatic'), | ||
160 | 'en' => t('English'), | ||
161 | 'fr' => t('French'), | ||
162 | ]; | ||
163 | } | ||
150 | } | 164 | } |
diff --git a/application/NetscapeBookmarkUtils.php b/application/NetscapeBookmarkUtils.php index 31a14537..dd7057f8 100644 --- a/application/NetscapeBookmarkUtils.php +++ b/application/NetscapeBookmarkUtils.php | |||
@@ -36,7 +36,6 @@ class NetscapeBookmarkUtils | |||
36 | } | 36 | } |
37 | 37 | ||
38 | $bookmarkLinks = array(); | 38 | $bookmarkLinks = array(); |
39 | 7 | ||
40 | foreach ($linkDb as $link) { | 39 | foreach ($linkDb as $link) { |
41 | if ($link['private'] != 0 && $selection == 'public') { | 40 | if ($link['private'] != 0 && $selection == 'public') { |
42 | continue; | 41 | continue; |