diff options
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/Controller/AppSettingsController.php | 2 | ||||
| -rw-r--r-- | settings/languageCodes.php | 63 | ||||
| -rw-r--r-- | settings/personal.php | 7 | ||||
| -rw-r--r-- | settings/templates/apps.php | 2 |
4 files changed, 6 insertions, 68 deletions
diff --git a/settings/Controller/AppSettingsController.php b/settings/Controller/AppSettingsController.php index a665532a3b7..fe050332fc8 100644 --- a/settings/Controller/AppSettingsController.php +++ b/settings/Controller/AppSettingsController.php @@ -239,6 +239,8 @@ class AppSettingsController extends Controller { 'canInstall' => true, 'preview' => isset($app['screenshots'][0]['url']) ? 'https://usercontent.apps.nextcloud.com/'.base64_encode($app['screenshots'][0]['url']) : '', 'score' => $app['ratingOverall'], + 'ratingNumOverall' => $app['ratingNumOverall'], + 'ratingNumThresholdReached' => $app['ratingNumOverall'] > 5 ? true : false, 'removable' => $existsLocally, 'active' => $this->appManager->isEnabledForUser($app['id']), 'needsDownload' => !$existsLocally, diff --git a/settings/languageCodes.php b/settings/languageCodes.php deleted file mode 100644 index 20d6ea701c7..00000000000 --- a/settings/languageCodes.php +++ /dev/null @@ -1,63 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Brice Maron <brice@bmaron.net> - * @author Jan-Christoph Borchardt <hey@jancborchardt.net> - * @author Morris Jobke <hey@morrisjobke.de> - * @author Pellaeon Lin <nfsmwlin@gmail.com> - * @author Robin Appelman <robin@icewind.nl> - * @author Thomas Müller <thomas.mueller@tmit.eu> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ - -return array( -'el'=>'Ελληνικά', -'en'=>'English', -'fa'=>'فارسى', -'fi_FI'=>'Suomi', -'hi'=>'हिन्दी', -'id'=>'Bahasa Indonesia', -'lb'=>'Lëtzebuergesch', -'ms_MY'=>'Bahasa Melayu', -'nb_NO'=>'Norwegian Bokmål', -'pt_BR'=>'Português brasileiro', -'pt_PT'=>'Português', -'ro'=>'română', -'sr@latin'=>'Srpski', -'sv'=>'Svenska', -'hu_HU'=>'Magyar', -'hr'=>'Hrvatski', -'ar'=>'العربية', -'lv'=>'Latviešu', -'mk'=>'македонски', -'uk'=>'Українська', -'vi'=>'Tiếng Việt', -'zh_TW'=>'正體中文（臺灣）', -'af_ZA'=> 'Afrikaans', -'bn_BD'=>'Bengali', -'ta_LK'=>'தமிழ்', -'zh_HK'=>'繁體中文（香港）', -'is'=>'Icelandic', -'ka_GE'=>'Georgian for Georgia', -'ku_IQ'=>'Kurdish Iraq', -'si_LK'=>'Sinhala', -'be'=>'Belarusian', -'ka'=>'Kartuli (Georgian)', -'my_MM'=>'Burmese - MYANMAR ', -'ur_PK' =>'Urdu (Pakistan)' -); diff --git a/settings/personal.php b/settings/personal.php index 24955c94071..27c1a25653d 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -79,7 +79,6 @@ $commonLangCodes = array( 'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko' ); -$languageNames=include 'languageCodes.php'; $languages=array(); $commonLanguages = array(); foreach($languageCodes as $lang) { @@ -87,9 +86,9 @@ foreach($languageCodes as $lang) { // TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version $potentialName = (string) $l->t('__language_name__'); if($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file - $ln=array('code'=>$lang, 'name'=> $potentialName); - }elseif(isset($languageNames[$lang])) { - $ln=array('code'=>$lang, 'name'=>$languageNames[$lang]); + $ln = array('code' => $lang, 'name' => $potentialName); + } elseif ($lang === 'en') { + $ln = ['code' => $lang, 'name' => 'English']; }else{//fallback to language code $ln=array('code'=>$lang, 'name'=>$lang); } diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 3753fd67a0c..2cb8378d74e 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -53,7 +53,7 @@ script( <div class="app-level"> {{{level}}} </div> - {{#if score}} + {{#if ratingNumThresholdReached }} <div class="app-score">{{{score}}}</div> {{/if}} <div class="app-detailpage"></div> |