Merge branch 'patch-16' into 'dev'

JS plurals displaying code cleanup See merge request hubzilla/core!1338 (cherry picked from commit 721461dd3e) b7280a44 JS plurals displaying code cleanup ab0e2f52 Update language.php f9c3b807 Update main.js ce52c27a Update main.js
2018-10-15 07:59:17 +00:00
parent 337e25ad43
commit eb133ef9a7
3 changed files with 9 additions and 8 deletions
--- a/include/language.php
+++ b/include/language.php
@@ -277,7 +277,7 @@ function ta($k){
 function tf() {

        $s = "plural_function_code";
-        return (x(App::$strings, $s) ? App::$strings[$s] : "return 0;");
+        return (x(App::$strings, $s) ? App::$strings[$s] : "0");
 }

 /**