From 567ed9ebd2603a5deb9c171b4d969f7188414794 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Tue, 19 Dec 2017 19:17:50 +0100
Subject: [PATCH] remove flags since they do not belong to language selection

---
 includes/controller/shift_entries_controller.php |   2 +-
 includes/helper/internationalization_helper.php  |   7 ++-----
 public/pic/flag/de_DE.UTF-8.png                  | Bin 545 -> 0 bytes
 public/pic/flag/en_US.UTF-8.png                  | Bin 599 -> 0 bytes
 4 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 public/pic/flag/de_DE.UTF-8.png
 delete mode 100644 public/pic/flag/en_US.UTF-8.png

diff --git a/includes/controller/shift_entries_controller.php b/includes/controller/shift_entries_controller.php
index d9813ebc..c28a3e9c 100644
--- a/includes/controller/shift_entries_controller.php
+++ b/includes/controller/shift_entries_controller.php
@@ -123,7 +123,7 @@ function shift_entry_add_controller()
             'SELECT `id` FROM `ShiftEntry` WHERE `SID`= ? AND `UID` = ?',
             [$shift['SID'], $user_id]))
         ) {
-            return error('This angel does already have an entry for this shift.', true);
+            return error(_('This angel does already have an entry for this shift.'), true);
         }
 
         $freeloaded = isset($shift['freeloaded']) ? $shift['freeloaded'] : false;
diff --git a/includes/helper/internationalization_helper.php b/includes/helper/internationalization_helper.php
index 7fa6518b..01aca71f 100644
--- a/includes/helper/internationalization_helper.php
+++ b/includes/helper/internationalization_helper.php
@@ -72,11 +72,8 @@ function make_langselect()
         $items[] = toolbar_item_link(
             htmlspecialchars($url),
             '',
-            sprintf(
-                '<img src="%s" alt="%s" title="%2$s"> %2$s',
-                url('pic/flag/' . $locale . '.png'),
-                $name
-            )
+            $name,
+            $locale == locale()
         );
     }
     return $items;
diff --git a/public/pic/flag/de_DE.UTF-8.png b/public/pic/flag/de_DE.UTF-8.png
deleted file mode 100644
index ac4a977362738ca7daa20784717f10f9617136b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 545
zcmV++0^a?JP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzvq?ljRCwBA
z^zm_K`1_sV-#-RsmS2DV{rdgq|G(c14F4E#0Du5u`ThHQadA12^$!gG{{8d!FNFL9
z1;2m)`3t6g|6aFlH9!EdFflO!Ri8L{2_yj){sja-K@bjp{P+RH{sB%vl>h<6BFn%a
z@b8~2SoNP@zd$;E{sbbRuHQd?{QCI=sNwhbA3*&Qe}GP900=;09NYi^f<O@Dffdn=
z{Wswq2xv6fOjc*mGA*Lr`%B&mEaDA%u^c0|iW~vN^8fd*|9}570M-5a{U4~}*ROw2
z4Pezk^!+<TKS(7513&<=05QYgKL~??j2}OMs-fC|s(=0b3semh|NHwd0|P(+vHZ4T
zU{L%2pZVYazyJRI2BN<Z#(z-o0!fCyzyAZte?ZcN@yB5XfB<6ougCCT=HGuopehjh
z4<vyWf<pKYB$$C>U@pUdVa9*13;+Sd!tjgXKhXQEMobL97(p6<<R6CrzyE{SK=RN3
z|3DpoK(_q)!}OH_Ab?nYyk*!kZ_+=YHfDyO-$60_pO1m*2g5&LKrl1>{RLvMGBN!7
j!N9=G@a-1^K!5=NcXWu!7_DDe00000NkvXXu0mjfeQx^H

diff --git a/public/pic/flag/en_US.UTF-8.png b/public/pic/flag/en_US.UTF-8.png
deleted file mode 100644
index ff701e19f6d2c0658fb23b1d94124cba4ce60851..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 599
zcmV-d0;v6oP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz`AI}URCwBAoHTQvnvLG!L$_YOVPIhR
z`}g19iWuE1ZBzdL{i|D>U(k2*|8J(R-+sudaynhucHbwAMTnor{mwqO^w7JHzaBsT
z{O^B8RYf5+LvDs&KmRKVd78=o{`1#HTiEo_OolaGleS)G+IQ#sUI`b*<ttPkoQ(BX
zdH(z-BO?RD#k&lb?f@B&-u_Q#y`y({1!HORg0(k0n@%tR-SPDK`}#L}kNztCZEmQ{
z)B=hyeE-bw{X3BEzCWGY&E{rcl9ShpD>pv<`1zCJ=H0jd{{2S>p`ri%{LsXJ%FbMS
z$#S`6f|?OG!^Jxczkf6Q`UNF{l0Sd`ad7zm>({^EzyAS6{{CgrkluOb3l1A>ZU2~A
zK+FZ=zkmP!`TOVhpFbzBzF<mgJlZ$!LUj7htJgj-ynFjAB?0L4|6jiYZ2)<O;r}yd
zr$cjg$jHr$OxbL1*Ua?e#~*QFwxu)O<=6CooI5XBFdeAs-_M^w$1wc=Z|$&LWbZyx
z#upb{59yi8GyMC*6cei&?XU5pqw<n{Y~wd`A)deg|1&UZN;7Io039Q%E))~L=CG!%
z=$tv3r|Yv5ZCRebeml)AZM~}fxupkx|M~vs@885Q)osT={QvXE{ra1g8}~B&`@4GU
lArU#j%I>aPmD2$N3;+$pK?>zdet`f0002ovPDHLkV1gy;I?Vt8