]> git.mxchange.org Git - friendica.git/commitdiff
Merge pull request #4312 from zeroadam/feature/L10n
authorHypolite Petovan <mrpetovan@gmail.com>
Wed, 24 Jan 2018 16:48:55 +0000 (11:48 -0500)
committerGitHub <noreply@github.com>
Wed, 24 Jan 2018 16:48:55 +0000 (11:48 -0500)
Move pgettext to src

1  2 
boot.php
include/datetime.php
mod/item.php
mod/profiles.php
src/Database/DBStructure.php
src/Object/Post.php
src/Protocol/Diaspora.php

diff --cc boot.php
Simple merge
Simple merge
diff --cc mod/item.php
Simple merge
Simple merge
Simple merge
index f933da9d0f3a81749da0607810e97b8b43861e22,b45f77ed764115ccc3adb1b7fd2af8a982f76e1f..67ce3b7cce88ccd5ee0fe998ddae8460cf7f92bb
@@@ -289,12 -291,18 +290,12 @@@ class Post extends BaseObjec
  
                if ($conv->isWritable()) {
                        $buttons = [
-                               'like'    => [t("I like this \x28toggle\x29"), t("like")],
-                               'dislike' => Feature::isEnabled($conv->getProfileOwner(), 'dislike') ? [t("I don't like this \x28toggle\x29"), t("dislike")] : '',
+                               'like'    => [L10n::t("I like this \x28toggle\x29"), L10n::t("like")],
+                               'dislike' => Feature::isEnabled($conv->getProfileOwner(), 'dislike') ? [L10n::t("I don't like this \x28toggle\x29"), L10n::t("dislike")] : '',
                        ];
                        if ($shareable) {
-                               $buttons['share'] = [t('Share this'), t('share')];
+                               $buttons['share'] = [L10n::t('Share this'), L10n::t('share')];
                        }
 -
 -                      // If a contact isn't writable, we cannot send a like or dislike to it
 -                      if (!$item['writable']) {
 -                              unset($buttons["like"]);
 -                              unset($buttons["dislike"]);
 -                      }
                }
  
                $comment = $this->getCommentBox($indent);
Simple merge