Merge branch '9.2RC'master

1 files changed, 6 insertions, 5 deletions

diff --git a/include/language.php b/include/language.php
index 1b2e7332e..538f67d90 100644
--- a/include/language.php
+++ b/include/language.php
@@ -10,6 +10,7 @@
 
 use CommerceGuys\Intl\Language\LanguageRepository;
 use LanguageDetection\Language;
+use Zotlabs\Lib\Config;
 
 /**
  * @brief Get the browser's submitted preferred languages.
@@ -17,7 +18,7 @@ use LanguageDetection\Language;
  * This functions parses the HTTP_ACCEPT_LANGUAGE header sent by the browser and
  * extracts the preferred languages and their priority.
  *
- * Get the language setting directly from system variables, bypassing get_config()
+ * Get the language setting directly from system variables, bypassing Config::Get()
  * as database may not yet be configured.
  *
  * If possible, we use the value from the browser.
@@ -197,10 +198,10 @@ function load_translation_table($lang, $install = false) {
  *
  * @param string $s string that should get translated
  * @param string $ctx (optional) context to appear in po file
- * @return translated string if exists, otherwise return $s
+ * @return string translated string if exists, otherwise return $s
  *
  */
-function t($s, $ctx = '') {
+function t($s, $ctx = ''): string {
 
 	$cs = $ctx ? '__ctx:' . $ctx . '__ ' . $s : $s;
 	if (x(App::$strings, $cs)) {
@@ -313,8 +314,8 @@ function detect_language($s) {
 		return EMPTY_STR;
 	}
 
-	$min_length = get_config('system', 'language_detect_min_length', LANGUAGE_DETECT_MIN_LENGTH);
-	$min_confidence = get_config('system', 'language_detect_min_confidence', LANGUAGE_DETECT_MIN_CONFIDENCE);
+	$min_length = Config::Get('system', 'language_detect_min_length', LANGUAGE_DETECT_MIN_LENGTH);
+	$min_confidence = Config::Get('system', 'language_detect_min_confidence', LANGUAGE_DETECT_MIN_CONFIDENCE);
 
 	// embedded apps have long base64 strings which will trip up the detector.
 	$naked_body = preg_replace('/\[app\](.*?)\[\/app\]/', '', $s);