harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some cleanups and documentation.

Browse Source 
Fixed some wrong variable names.
Initialized some variables before using them.
Removed some checks for STATUSNET_PRIVACY_COMPATIBILITY in
include/security.php as it does not seem to be defined anywhere.
This commit is contained in:
Klaus Weidenbach
2015-03-04 00:03:19 +01:00
parent 2d38e58adb
commit 0d601563d0
7 changed files with 173 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/language.php
View File

@@ -24,6 +24,7 @@
*/
function get_browser_language() {
$langs = array();
$lang_parse = array();
if (x($_SERVER,'HTTP_ACCEPT_LANGUAGE')) {
// break up string into pieces (languages and q factors)
@@ -33,7 +34,7 @@ function get_browser_language() {
if (count($lang_parse[1])) {
// create a list like "en" => 0.8
$langs = array_combine($lang_parse[1], $lang_parse[4]);
// set default to 1 for any without q factor
foreach ($langs as $lang => $val) {
if ($val === '') $langs[$lang] = 1;
@@ -144,16 +145,16 @@ function load_translation_table($lang, $install = false) {
/**
* @brief translate string if translation exists.
*
* @param $s string that should get translated
* @param $ctx optional context to appear in po file
* @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
*
*/
function t($s,$ctx = '') {
function t($s, $ctx = '') {
global $a;
$cs = $ctx?"__ctx:".$ctx."__ ".$s:$s;
if(x($a->strings,$cs)) {
$cs = $ctx ? '__ctx:' . $ctx . '__ ' . $s : $s;
if(x($a->strings, $cs)) {
$t = $a->strings[$cs];
return is_array($t) ? $t[0] : $t;
}
@@ -218,7 +219,7 @@ function detect_language($s) {
// strip off bbcode
$naked_body = preg_replace('/\[(.+?)\]/', '', $naked_body);
if(mb_strlen($naked_body) < intval($min_length)) {
logger('detect language: string length less than ' . intval($min_length), LOGGER_DATA);
logger('string length less than ' . intval($min_length), LOGGER_DATA);
return '';
}