From c543ac72dd041629f15557c4a3c29d0a98333f84 Mon Sep 17 00:00:00 2001
From: Tilman Kranz <tilt@linuxfoo.de>
Date: Sun, 28 Nov 2021 00:47:07 +0100
Subject: [PATCH] include .mo file

---
 .gitignore                    |   1 -
 lang/linuxfoo-gitlab-de_DE.mo | Bin 0 -> 3401 bytes
 lang/linuxfoo-gitlab-de_DE.po |   4 +-
 linuxfoo-gitlab.php           |  72 +++++++++++++++++++++-------------
 4 files changed, 47 insertions(+), 30 deletions(-)
 create mode 100644 lang/linuxfoo-gitlab-de_DE.mo

diff --git a/.gitignore b/.gitignore
index a23b892..e69de29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +0,0 @@
-lang/*.mo
diff --git a/lang/linuxfoo-gitlab-de_DE.mo b/lang/linuxfoo-gitlab-de_DE.mo
new file mode 100644
index 0000000000000000000000000000000000000000..0f91cfe2e6d809276d23c6b7c1ab0ad3ca4d5595
GIT binary patch
literal 3401
zcmbuB%WoS+9LJ~h0R+mUEpJr)u$sQe+Hp$M%3ws2rd4QCLh8^8RH3nVY)`#A>(0#P
z^*5l3OAp+80U?eEL2tRhUjP!Qr%FiNxb%bs-`U-95|lQPy3+dNUH@i&&-wj)@6f*6
z4A+~*{SP>d`;R^Nz}0_(vDd+y;9KAq#q)RIb9nv*JP!T_o&x^`Pk^WPGIk977%YKH
z;Pc>Dpj-DfI0XIxy8YL|r@(vQ8{nUyTeo*#{(Ky~guN$0xBsmJj6Dl}58@SD2Ty`O
zgD--AgHMBdpJWVQ*+J0hKLYLtkAXMf<7x01o^L}rfj@%Ip5H-d=L2vA+>gyF;20Qy
zP4G1MC3q7233PhzgHF!_@D=a?oOJsi1+f*I0*`{Tp!2T>I)870d*I(U;AuR63+J4F
zzv9E$dmnUq{sNtz!v}N!hC#T%Dj=4!v!L^L5-d`f*?~ufkY<;&&&j&W?d5Xs);N96
z7N^hc=`R<L!?<6<eF*o<xL?KXF6WcGj^KvNS<GGlT~6HfOb!Ou*lX_lR1(M18d_YK
zC6!pxg15T78Hw`XC#l+rj=7bI@*-g_aZ%ccH)&z|N`ofmXXr{d(YBR@!m#3}zD{n4
zmSr<)iAORde5Qi1AN9HBv9Ll@sg>JMDnDAR*z0o{?j)&2B)Ab~CpjZkOY9_+>IfpU
z+*le8sjwB#R^UyciCs<xzs%<@Zx_*p!Y<~&JW7Zj9`^-tGnHC|n}Qfi18+KIb|sBt
zu2*X`9XBBnNm!Y*DNZtLTS8fHDcOWLZA}!lbrNs9mC9I-7@aWGPn(f!4RT$k=@lOL
zBT=J?Fr?2qSt$fgT~Ne`5V?BS+P<k(Dz+Dx$dp4-$t7tcoAr0byh-&EkD?M~d8wDq
zz-nc?C5rh<ecZ>|)Jsto{L=NTkodqyZgV%s{dUen+r{fbS^lsrw7{03$n}t4R;V+?
zJIM&Pj-q545p1p!N>}yr%>?Djy)`bjwkrl2PRcfMwR);djf6sJ+(F3%d?JeAjF1t7
zOw>y%Q7A;WrX!Tl@DEAwOAr&U&gAQSf#>mhs4g!yLJ1CeW=6@sE5UE8Wiy2;97ku3
z|H+%f8eNIR7xmobhFYoCsGw*SjbI>NW(^s|T+t=X)fx-=s$nkeTe7Z2yU6^O8p#B=
z)CZG_n%Jn-Wm)zO%c{Yhz2Pi1Y*lb=SaHmPnK1Z7XoKcd^R>K9KcZ@RY-mCB(Vv1j
z(~)5?nRZOjNNVIObUD#sUkhW(iSATP+IPa0ew22ks-OVUm3EQ@dG!vtb`UgRra?I*
zx<;ErK=0Xd&&A?{LDj!MG&eIhy<us!JUTRm;zlro#%dp@$ch!GjZ5_|p#y6qq`ug=
z5S-hPbL!ec2h$2Y7Kgn?=bF+E&3_auh$ZPl5S&Nl)M#vUtQu6S!PwbGwOSjm)~cg#
zk5+4=qeIt%i+O!Ho3G9XQ?oNPRvw2n*Mjp&4DB_P-Bw?VULH*4Z92$Cg=}>#2~-2V
zG`aTEBAD4cEHa@;m`tE(G}|P{E67sXvushVrP2BwG_(%J!&RXzwb$=zn%{0@>_WJx
z;CyiGLf)SPwEbO3`ysLm(PEScyM{xDf-WM;E{hbyM9@M$AJ`=!6&gU#rXq@j8p!1#
z42n2CBoW0XW-w%Skb6YRE+=+bs4z>zM)2FB8(H>gYIqzA)#k>et`;YSg$uJ70D?l~
zP32AvtS9G`DbA?(0Wa`+1f3Es87(UJ&<w^5@g`~@Z6gTFQio+|k)|(2RHF;)cRTK{
zM1+nR;`hOy4_ZqzT`^5)D|;fMu0%zRP#R}?qAdQ3#(iATu-DQx0XGXvR93j_cOv)q
zghz(X&|IQiQ%17G+G9_<ZRgwdGA-r?Zp5%C5a&@SP!DoRVtC<<7E{D`YPT}0nSALI
z{;Byg$emwHaf0AqZP2y-=)g*q>MSrt#{AMvVcEP44G+bNvvFPu{KulA8p+LB<Q;Le
m)XR+VCj4(eG&l@-tO*g*WIiGCtSDxj(riMo4|x|6V*deqVgRWC

literal 0
HcmV?d00001

diff --git a/lang/linuxfoo-gitlab-de_DE.po b/lang/linuxfoo-gitlab-de_DE.po
index 200b3a2..9d39fe0 100644
--- a/lang/linuxfoo-gitlab-de_DE.po
+++ b/lang/linuxfoo-gitlab-de_DE.po
@@ -22,8 +22,8 @@ msgid "http://tk-sls.de/ref/gitlab-list-commits"
 msgstr "http://tk-sls.de/ref/gitlab-list-commits"
 
 #. Description of the plugin
-msgid "Summary: Embed list of most recent commits to a Gitlab project from a Gitlab instance's public REST API. Example: Add [gitlab-list-commits url=https://tk-sls.de/gitlab project_id=42 since=\"3 month\" max=5] for a list of at most 5 commits to that project that were made since at most 3 months ago."
-msgstr "Zusammenfassung: Bette Liste der neuesten Commits eines Gitlab-Projektes ein, die mit Gitlabs REST API abgerufen wird. Beispiel: Füge folgenden Shortcode zu einem Artikel hinzu, um die letzten 5 Commits anzuzeigen, die nicht älter als 3 Monate sind: [gitlab-list-commits url=https://tk-sls.de/gitlab project_id=42 since=\"3 month\" max=5]"
+msgid "Summary: Embed list of most recent commits to a Gitlab project from a Gitlab instance's public REST API. Example: Add [gitlab-list-commits url=https://tk-sls.de/gitlab project_id=42 commits=\"all\" since=\"3 month\" max=5 releases=\"latest\"] for a list of at most 5 commits to that project that were made since at most 3 months ago, followed by alink to the latest release of the project (if any). To disable the list of commits, set commits=\"none\". To generate a list of all releases, set releases=\"all\". To disable the list of releases, omit the \"releases\" attribute or set releases=\"none\"."
+msgstr "Zusammenfassung: Bette Liste der neuesten Commits eines Gitlab-Projektes ein, die mit Gitlabs REST API abgerufen wird. Beispiel: Füge folgenden Shortcode zu einem Artikel hinzu, um die letzten 5 Commits anzuzeigen, die nicht älter als 3 Monate sind: [gitlab-list-commits url=https://tk-sls.de/gitlab project_id=42 since=\"3 month\" max=5]. Um die Liste der Commits zu deaktivieren: commits=\"none\". Um eine Liste von Releases hinzuzufügen: releases=\"all\". Um nur die neueste Release anzuzeigen: releases=\"latest\"."
 
 #. Author of the plugin
 msgid "Tilman Kranz"
diff --git a/linuxfoo-gitlab.php b/linuxfoo-gitlab.php
index db9beee..85b603c 100644
--- a/linuxfoo-gitlab.php
+++ b/linuxfoo-gitlab.php
@@ -47,6 +47,43 @@ class LinuxfooGitlab {
         return sprintf(__('since %d %s ago', 'linuxfoo-gitlab'), $num, $unit);
     }
 
+    static function format_commit($atts, $commit) {
+        $out = '';
+
+        preg_match('/^....-..-../', $commit->committed_date, $m);
+        $date = $m[0];
+
+        $title = htmlspecialchars($commit->title, ENT_NOQUOTES|ENT_HTML5|ENT_SUBSTITUTE, 'UTF-8', FALSE);
+
+        $out .= 
+            $date.' '.
+            __('by', 'linuxfoo-gitlab').' '.$commit->author_name.
+            ': '.
+            '<a href="'.$commit->web_url.'">'.$commit->short_id.'</a> '.$title;
+
+        return $out;
+    }
+
+    static function format_commit_stats($atts, $commits_count, $branch) {
+        $out = '';
+
+        if($commits_count==0) {
+            $out .=
+                __('No commits', 'linuxfoo-gitlab').
+                (is_null($branch) ? '' : ' '.__('in branch', 'linuxfoo-gitlab').' "'.$branch.'"').
+                (is_null($atts['since']) ? '' : ' '.('since '.$atts['since'].' ago')).'.';
+        }
+        else {
+            $out .=
+                /* translators: %d: maximum number of commits displayed */
+                sprintf(__('Last %d commits', 'linuxfoo-gitlab'), $commits_count).
+                (is_null($branch) ? '' : ' '.__('in branch', 'linuxfoo-gitlab').' "'.$branch.'"').
+                (is_null($atts['since']) ? '' : ' '.self::format_since($atts['since'])).':';
+        }
+
+        return $out;
+    }
+
 	static function commits_list($atts, $project_url) {
         $since = null;
 
@@ -99,37 +136,18 @@ class LinuxfooGitlab {
             else {
                 $commits_count = count($commits); 
                 $commits_count = is_null($atts['max']) ? $commits_count : min($commits_count, $atts['max']);
-
                 $commits = array_slice($commits, 0, $commits_count);
 
-                if($commits_count==0) {
-                    $out .=
-                        '<span class="stats">'.
-                            __('No commits', 'linuxfoo-gitlab').
-                            (is_null($branch) ? '' : ' '.__('in branch', 'linuxfoo-gitlab').' "'.$branch.'"').
-                            (is_null($atts['since']) ? '' : ' '.('since '.$atts['since'].' ago')).'.'.
-                        '</span>';
-                }
-                else {
-                    $out .=
-                        '<span class="stats">'.
-                            /* translators: %d: maximum number of commits displayed */
-                            sprintf(__('Last %d commits', 'linuxfoo-gitlab'), $commits_count).
-                            (is_null($branch) ? '' : ' '.__('in branch', 'linuxfoo-gitlab').' "'.$branch.'"').
-                            (is_null($atts['since']) ? '' : ' '.self::format_since($atts['since'])).':'.
-                        '</span>'.
-                        '<ul class="commits">';
+                $out .=
+                    '<span class="stats">'.
+                        self::format_commit_stats($atts, $commits_count, $branch).
+                    '</span>';
+
+                if($commits_count>0) {
+                    $out .= '<ul class="commits">';
 
                     foreach($commits as $commit) {
-                        preg_match('/^....-..-../', $commit->committed_date, $m);
-                        $date = $m[0];
-
-                        $title = htmlspecialchars($commit->title, ENT_NOQUOTES|ENT_HTML5|ENT_SUBSTITUTE, 'UTF-8', FALSE);
-
-                        $out .=
-                            '<li>'.
-                                $date.': <a href="'.$commit->web_url.'">'.$commit->short_id.'</a> '.$title.
-                            '</li>';
+                        $out .= '<li>'.self::format_commit($atts, $commit).'</li>';
                     }
 
                     $out .= '</ul>';