summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
authorczaks <marcin@6irc.net>2013-07-31 17:02:30 -0400
committerczaks <marcin@6irc.net>2013-07-31 17:02:30 -0400
commitc0abd1d851b1866e8a9709a0c75797025b77aa40 (patch)
treeb9622c692a68036de2018ffd68880e0dc773ad9e /inc
parent3d979750b1be802549e4e18662c7e642f466daaa (diff)
parent6cdf6038754f18af4509ecf078f51894f63c5853 (diff)
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Diffstat (limited to 'inc')
-rw-r--r--inc/lib/Twig/Extensions/Extension/Tinyboard.php8
-rw-r--r--inc/locale/pl_PL/LC_MESSAGES/tinyboard.mobin19790 -> 19840 bytes
-rw-r--r--inc/locale/pl_PL/LC_MESSAGES/tinyboard.po2
3 files changed, 5 insertions, 5 deletions
diff --git a/inc/lib/Twig/Extensions/Extension/Tinyboard.php b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
index 61cf9fc9..58a98c40 100644
--- a/inc/lib/Twig/Extensions/Extension/Tinyboard.php
+++ b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
@@ -83,9 +83,9 @@ function twig_hasPermission_filter($mod, $permission, $board = null) {
}
function twig_extension_filter($value, $case_insensitive = true) {
- $ext = substr($value, strrpos($value, '.') + 1);
+ $ext = mb_substr($value, mb_strrpos($value, '.') + 1);
if($case_insensitive)
- $ext = strtolower($ext);
+ $ext = mb_strtolower($ext);
return $ext;
}
@@ -96,11 +96,11 @@ function twig_sprintf_filter( $value, $var) {
function twig_truncate_filter($value, $length = 30, $preserve = false, $separator = '&hellip;') {
if (mb_strlen($value) > $length) {
if ($preserve) {
- if (false !== ($breakpoint = strpos($value, ' ', $length))) {
+ if (false !== ($breakpoint = mb_strpos($value, ' ', $length))) {
$length = $breakpoint;
}
}
- return substr($value, 0, $length) . $separator;
+ return mb_substr($value, 0, $length) . $separator;
}
return $value;
}
diff --git a/inc/locale/pl_PL/LC_MESSAGES/tinyboard.mo b/inc/locale/pl_PL/LC_MESSAGES/tinyboard.mo
index 2a31d64e..bc603e67 100644
--- a/inc/locale/pl_PL/LC_MESSAGES/tinyboard.mo
+++ b/inc/locale/pl_PL/LC_MESSAGES/tinyboard.mo
Binary files differ
diff --git a/inc/locale/pl_PL/LC_MESSAGES/tinyboard.po b/inc/locale/pl_PL/LC_MESSAGES/tinyboard.po
index ca4f7ea4..20802b7d 100644
--- a/inc/locale/pl_PL/LC_MESSAGES/tinyboard.po
+++ b/inc/locale/pl_PL/LC_MESSAGES/tinyboard.po
@@ -16,7 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#. There is no previous page.
#: /var/www/html/Tinyboard/inc/functions.php:958