Display the languages in the post

diff --git a/include/conversation.php b/include/conversation.php
index f3df8db0152c9e84bc8ea4c10924ae6c460140e6..1e8437f71532753752a354821ad55b7221936c1b 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -917,6 +917,10 @@ function item_photo_menu($item) {
                        DI::l10n()->t('Ignore') => $ignore_link
                ];
 
+               if (!empty($item['language'])) {
+                       $menu[DI::l10n()->t('Languages')] = 'javascript:alert(\'' . Item::getLanguageMessage($item) . '\');';
+               }
+
                if ($network == Protocol::DFRN) {
                        $menu[DI::l10n()->t("Poke")] = $poke_link;
                }

diff --git a/mod/settings.php b/mod/settings.php
index 92a7bb461ff781cb795c4eafb6ee42f3aef5ed51..d1eefefc0dfa0a9a2da5d84beb4007244f62bfe8 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -225,7 +225,7 @@ function settings_post(App $a)
                if (isset($_FILES['importcontact-filename'])) {
                        // was there an error
                        if ($_FILES['importcontact-filename']['error'] > 0) {
-                               Logger::notice('Contact CSV file upload error');
+                               Logger::notice('Contact CSV file upload error', ['error' => $_FILES['importcontact-filename']['error']]);
                                notice(DI::l10n()->t('Contact CSV file upload error'));
                        } else {
                                $csvArray = array_map('str_getcsv', file($_FILES['importcontact-filename']['tmp_name']));

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 8af14e8243c3bd46966b4089a1880020ef28e6d4..dfea296815a94229bc07e8ad9f16a6968f468ffe 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -2487,6 +2487,16 @@ class Item
                return '';
        }
 
+       public static function getLanguageMessage(array $item)
+       {
+               $used_languages = '';
+               foreach (json_decode($item['language'], true) as $language => $reliability) {
+                       $used_languages .= $language . ": " . number_format($reliability, 5) . '\n';
+               }
+               $used_languages = DI::l10n()->t('Used languages in this post:\n%s', $used_languages);
+               return $used_languages;
+       }
+
        /**
         * Creates an unique guid out of a given uri
         *

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 51b952d610481dc326793d3e83fd5164e7bfd79c..894b75f93fb77ab2a6bf80d99e7f655503614176 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -411,6 +411,11 @@ class Post
                        }
                }
 
+               $languages = [];
+               if (!empty($item['language'])) {
+                       $languages = [DI::l10n()->t('Languages'), Item::getLanguageMessage($item)];
+               }
+
                $tmp_item = [
                        'template'        => $this->getTemplate(),
                        'type'            => implode("", array_slice(explode("/", $item['verb']), -1)),
@@ -466,6 +471,7 @@ class Post
                        'ignore'          => $ignore,
                        'tagger'          => $tagger,
                        'filer'           => $filer,
+                       'language'        => $languages,
                        'drop'            => $drop,
                        'vote'            => $buttons,
                        'like_html'       => $responses['like']['output'],

diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl
index b516d486fb69243257323f25d4aced64078fb4a6..717340b8b330dc260a7cafa30e03cfccfe28a21c 100644 (file)
--- a/view/theme/frio/templates/search_item.tpl
+++ b/view/theme/frio/templates/search_item.tpl
@@ -217,6 +217,12 @@
                                                        </li>
                                                {{/if}}
 
+                                               {{if $item.language}}
+                                               <li role="menuitem">
+                                                       <a id="language-{{$item.id}}" href="javascript:alert('{{$item.language.1}}');" class="btn-link filer-item language-icon" title="{{$item.language.0}}"><i class="fa fa-language" aria-hidden="true"></i>&nbsp;{{$item.language.0}}</a>
+                                               </li>
+                                               {{/if}}
+
                                                {{if ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.subthread) && ($item.ignore || $item.drop.dropping)}}
                                                        <li role="separator" class="divider"></li>
                                                {{/if}}

diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 048fbc226884f474c823e0a6290f50c92b485064..0375dc4725cea0183a97391a60af812e18b1bc21 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -363,6 +363,12 @@ as the value of $top_child_total (this is done at the end of this file)
                                                </li>
                                                {{/if}}
 
+                                               {{if $item.language}}
+                                               <li role="menuitem">
+                                                       <a id="language-{{$item.id}}" href="javascript:alert('{{$item.language.1}}');" class="btn-link filer-item language-icon" title="{{$item.language.0}}"><i class="fa fa-language" aria-hidden="true"></i>&nbsp;{{$item.language.0}}</a>
+                                               </li>
+                                               {{/if}}
+
                                                {{if ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.subthread) && ($item.ignore || $item.drop.dropping)}}
                                                <li role="separator" class="divider"></li>
                                                {{/if}}