From acfe72cb9155ca08bd5799d0dde331702e25e9ce Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Wed, 29 Aug 2018 20:25:29 +0200
Subject: Removed translation from config file

---
 includes/pages/admin_active.php  | 20 +++++++++-----------
 includes/pages/admin_user.php    |  9 +--------
 includes/pages/guest_login.php   |  8 +-------
 includes/pages/user_settings.php |  6 ------
 4 files changed, 11 insertions(+), 32 deletions(-)

(limited to 'includes/pages')

diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php
index 33a7e01e..35dbe60b 100644
--- a/includes/pages/admin_active.php
+++ b/includes/pages/admin_active.php
@@ -244,18 +244,16 @@ function admin_active()
 
     $shirt_statistics = [];
     foreach (array_keys($tshirt_sizes) as $size) {
-        if (!empty($size)) {
-            $gc = DB::selectOne(
-                'SELECT count(*) FROM `User` WHERE `Size`=? AND `Tshirt`=1',
-                [$size]
-            );
-            $gc = array_shift($gc);
+        $gc = DB::selectOne(
+            'SELECT count(*) FROM `User` WHERE `Size`=? AND `Tshirt`=1',
+            [$size]
+        );
+        $gc = array_shift($gc);
 
-            $shirt_statistics[] = [
-                'size'  => $size,
-                'given' => (int)$gc
-            ];
-        }
+        $shirt_statistics[] = [
+            'size'  => $size,
+            'given' => (int)$gc
+        ];
     }
 
     $shirtCount = User_tshirts_count();
diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php
index 514e4b1b..2841c278 100644
--- a/includes/pages/admin_user.php
+++ b/includes/pages/admin_user.php
@@ -18,13 +18,6 @@ function admin_user()
     global $user, $privileges;
     $tshirt_sizes = config('tshirt_sizes');
     $request = request();
-
-    foreach ($tshirt_sizes as $key => $size) {
-        if (empty($size)) {
-            unset($tshirt_sizes[$key]);
-        }
-    }
-
     $html = '';
 
     if (!$request->has('id')) {
@@ -68,7 +61,7 @@ function admin_user()
         }
         $html .= "  <tr><td>jabber</td><td>" . '<input size="40" name="ejabber" value="' . $user_source['jabber'] . '" class="form-control"></td></tr>' . "\n";
         $html .= '  <tr><td>Size</td><td>'
-            . html_select_key('size', 'eSize', $tshirt_sizes, $user_source['Size']) . '</td></tr>' . "\n";
+            . html_select_key('size', 'eSize', $tshirt_sizes, $user_source['Size'], _('Please select...')) . '</td></tr>' . "\n";
 
         $options = [
             '1' => _('Yes'),
diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php
index 47e16915..d23d9f96 100644
--- a/includes/pages/guest_login.php
+++ b/includes/pages/guest_login.php
@@ -69,12 +69,6 @@ function guest_register()
         }
     }
 
-    foreach ($tshirt_sizes as $key => $size) {
-        if (empty($size)) {
-            unset($tshirt_sizes[$key]);
-        }
-    }
-
     if (!in_array('register', $privileges) || (!isset($user) && !config('registration_enabled'))) {
         error(_('Registration is disabled.'));
 
@@ -334,7 +328,7 @@ function guest_register()
                         div('col-sm-6', [
                             $enable_tshirt_size ? form_select('tshirt_size',
                                 _('Shirt size') . ' ' . entry_required(),
-                                $tshirt_sizes, $tshirt_size) : ''
+                                $tshirt_sizes, $tshirt_size, _('Please select...')) : ''
                         ])
                     ]),
                     div('row', [
diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php
index b3a5bdf5..930d55d9 100644
--- a/includes/pages/user_settings.php
+++ b/includes/pages/user_settings.php
@@ -224,12 +224,6 @@ function user_settings()
         }
     }
 
-    foreach ($tshirt_sizes as $key => $size) {
-        if (empty($size)) {
-            unset($tshirt_sizes[$key]);
-        }
-    }
-
     $user_source = $user;
 
     if ($request->has('submit')) {
-- 
cgit v1.2.3-54-g00ecf