Remove only_display_incidents option and use only_disrupted_days for …

…only-displaying-incidents behaviour
cachethq · Dec 11, 2017 · 0f3289a · 0f3289a
1 parent 104ae85
commit 0f3289a
Show file tree

Hide file tree

Showing 36 changed files with 6 additions and 64 deletions.
diff --git a/app/Composers/AppComposer.php b/app/Composers/AppComposer.php
@@ -86,7 +86,6 @@ public function compose(View $view)
         $view->withSiteTitle($this->config->get('setting.app_name'));
         $view->withFontSubset($this->config->get('langs.'.$this->config->get('app.locale').'.subset', 'latin'));
         $view->withOnlyDisruptedDays($this->config->get('setting.only_disrupted_days'));
-        $view->withOnlyDisplayIncidents($this->config->get('setting.only_display_incidents'));
         $view->withDashboardLink($this->config->get('setting.dashboard_login_link'));
         $view->withEnableSubscribers($this->config->get('setting.enable_subscribers'));
     }

diff --git a/app/Http/Controllers/StatusPageController.php b/app/Http/Controllers/StatusPageController.php
@@ -69,13 +69,11 @@ private function showIndexByDate()
         });
 
         // Add in days that have no incidents
-        if (Config::get('setting.only_disrupted_days') === false) {
-            foreach ($incidentDays as $i => $day) {
-                $date = app(DateFactory::class)->make($startDate)->subDays($i);
+        foreach ($incidentDays as $i => $day) {
+            $date = app(DateFactory::class)->make($startDate)->subDays($i);
 
-                if (!isset($allIncidents[$date->toDateString()])) {
-                    $allIncidents[$date->toDateString()] = [];
-                }
+            if (!isset($allIncidents[$date->toDateString()])) {
+                $allIncidents[$date->toDateString()] = [];
             }
         }
 
@@ -144,9 +142,9 @@ private function showIndexByQuantity()
      */
     public function showIndex()
     {
-        $only_display_incidents = Config::get('setting.only_display_incidents', false);
+        $only_disrupted_days = Config::get('setting.only_disrupted_days');
 
-        if ($only_display_incidents) {
+        if ($only_disrupted_days) {
             return $this->showIndexByQuantity();
         }
 

diff --git a/config/setting.php b/config/setting.php
@@ -99,16 +99,4 @@
     */
 
     'only_disrupted_days' => false,
-
-    /*
-    |--------------------------------------------------------------------------
-    | Only display incidents
-    |--------------------------------------------------------------------------
-    |
-    | Whether to only display incidents, no matter the date. In this case, the
-    | number of days to show setting becomes the number of incidents to show.
-    |
-    */
-
-    'only_display_incidents' => false,
 ];
diff --git a/resources/lang/af-ZA/forms.php b/resources/lang/af-ZA/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Enable Third Party Dependencies (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Show the timezone the status page is running in.',
             'only_disrupted_days'          => 'Only show days containing incidents in the timeline?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Google Analytics code',

diff --git a/resources/lang/ca-ES/forms.php b/resources/lang/ca-ES/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Enable Third Party Dependencies (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Show the timezone the status page is running in.',
             'only_disrupted_days'          => 'Only show days containing incidents in the timeline?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Codi de Google Analytics',

diff --git a/resources/lang/cs-CZ/forms.php b/resources/lang/cs-CZ/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Povolit závislosti třetích stran (Google písma, Trackery, atd...)',
             'show_timezone'                => 'Zobrazit časové pásmo, ve které je zobrazena stavová stránka.',
             'only_disrupted_days'          => 'Zobrazit na časové ose pouze dny, kdy došlo k incidentu?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Kód pro Google Analytics',

diff --git a/resources/lang/da-DK/forms.php b/resources/lang/da-DK/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Enable Third Party Dependencies (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Show the timezone the status page is running in.',
             'only_disrupted_days'          => 'Only show days containing incidents in the timeline?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Google Analytics kode',

diff --git a/resources/lang/el-GR/forms.php b/resources/lang/el-GR/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Enable Third Party Dependencies (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Show the timezone the status page is running in.',
             'only_disrupted_days'          => 'Only show days containing incidents in the timeline?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Google Analytics code',

diff --git a/resources/lang/en-UD/forms.php b/resources/lang/en-UD/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'crwdns1200:0crwdne1200:0',
             'show_timezone'                => 'crwdns1201:0crwdne1201:0',
             'only_disrupted_days'          => 'crwdns1202:0crwdne1202:0',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'crwdns1203:0crwdne1203:0',

diff --git a/resources/lang/en-US/forms.php b/resources/lang/en-US/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Enable Third Party Dependencies (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Show the timezone the status page is running in.',
             'only_disrupted_days'          => 'Only show days containing incidents in the timeline?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Google Analytics code',

diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php
@@ -160,7 +160,6 @@
             'enable_external_dependencies' => 'Enable Third Party Dependencies (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Show the timezone the status page is running in.',
             'only_disrupted_days'          => 'Only show days containing incidents in the timeline?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Google Analytics code',

diff --git a/resources/lang/es-ES/forms.php b/resources/lang/es-ES/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Activar Dependencias de Terceros (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Mostrar la zona horaria en la que se está ejecutando la página de estado.',
             'only_disrupted_days'          => '¿Solamente mostrar en la línea de tiempo días que contengan incidentes?',
-            'only_display_incidents'       => '¿Mostrar únicamente incidentes en la línea temporal (sin importar la fecha)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Código de Google Analytics',

diff --git a/resources/lang/fa-IR/forms.php b/resources/lang/fa-IR/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Enable Third Party Dependencies (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Show the timezone the status page is running in.',
             'only_disrupted_days'          => 'Only show days containing incidents in the timeline?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'کد آمارگیر گوگل',

diff --git a/resources/lang/fi-FI/forms.php b/resources/lang/fi-FI/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Enable Third Party Dependencies (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Näytä aikavyöhyke tilat sivulla.',
             'only_disrupted_days'          => 'Only show days containing incidents in the timeline?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Google Analytics seurantakoodi',

diff --git a/resources/lang/fr-FR/forms.php b/resources/lang/fr-FR/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Activer les dépendances tierces (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Afficher le fuseau horaire sur la page de statut.',
             'only_disrupted_days'          => 'Afficher uniquement les jours contenant des incidents dans la ligne de temps ?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Code de Google Analytics',

diff --git a/resources/lang/he-IL/forms.php b/resources/lang/he-IL/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Enable Third Party Dependencies (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Show the timezone the status page is running in.',
             'only_disrupted_days'          => 'Only show days containing incidents in the timeline?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Google Analytics code',

diff --git a/resources/lang/hu-HU/forms.php b/resources/lang/hu-HU/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Enable Third Party Dependencies (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Show the timezone the status page is running in.',
             'only_disrupted_days'          => 'Only show days containing incidents in the timeline?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Google Analytics kód',

diff --git a/resources/lang/id-ID/forms.php b/resources/lang/id-ID/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Aktifkan Dependensi Pihak Ketiga (Font Google, Trackers, dll...)',
             'show_timezone'                => 'Tampilkan zona waktu dimana halaman status berjalan.',
             'only_disrupted_days'          => 'Hanya tampilkan hari yang berisi insiden dalam linimasa?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Kode Google Analytics',

diff --git a/resources/lang/it-IT/forms.php b/resources/lang/it-IT/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Attivare le dipendenze di terze parti (Google Fonts, Trackers, ecc...)',
             'show_timezone'                => 'Visualizza il fuso orario nella pagina stato.',
             'only_disrupted_days'          => 'Mostra solo i giorni contenenti incidenti nella timeline?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Codice Google Analytics',

diff --git a/resources/lang/ja-JP/forms.php b/resources/lang/ja-JP/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Enable Third Party Dependencies (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Show the timezone the status page is running in.',
             'only_disrupted_days'          => 'Only show days containing incidents in the timeline?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Google Analytics code',

diff --git a/resources/lang/ko-KR/forms.php b/resources/lang/ko-KR/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Enable Third Party Dependencies (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Show the timezone the status page is running in.',
             'only_disrupted_days'          => 'Only show days containing incidents in the timeline?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Google Analytics 코드',

diff --git a/resources/lang/nl-NL/forms.php b/resources/lang/nl-NL/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Schakel afhankelijkheden van derden in (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Toon de tijdzone waarin de statuspagina staat.',
             'only_disrupted_days'          => 'Alleen dagen met incidenten op de tijdlijn tonen?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Google Analytics-code',

diff --git a/resources/lang/no-NO/forms.php b/resources/lang/no-NO/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Aktiver tredjeparts avhengigheter (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Vis tidssonen statussiden kjører i.',
             'only_disrupted_days'          => 'Bare Vis dager som inneholder hendelser i tidslinjen?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Google Analytics-koden',

diff --git a/resources/lang/pl-PL/forms.php b/resources/lang/pl-PL/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Włącz zależności zewnętrznych dostawców (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Pokazuj strefę czasową w której działa strona statusu.',
             'only_disrupted_days'          => 'Czy pokazywać tylko dni zawierające zdarzenia w linii czasu?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Google Analytics Code',

diff --git a/resources/lang/pt-BR/forms.php b/resources/lang/pt-BR/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Ativar dependências de terceiros (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Mostre qual o fuso horário na qual a página de estado está rodando.',
             'only_disrupted_days'          => 'Mostrar apenas os dias que contenham incidentes na linha do tempo?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Código do Google Analytics',

diff --git a/resources/lang/pt-PT/forms.php b/resources/lang/pt-PT/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Enable Third Party Dependencies (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Show the timezone the status page is running in.',
             'only_disrupted_days'          => 'Only show days containing incidents in the timeline?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Código do Google Analytics',

diff --git a/resources/lang/ro-RO/forms.php b/resources/lang/ro-RO/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Activează dependențe terțe (Fonturi Google, Trackere, etc...)',
             'show_timezone'                => 'Afișează fusul orar în care rulează pagina de stare.',
             'only_disrupted_days'          => 'Afișează doar zile care conțin incidente în cronologie?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Cod Google Analytics',

diff --git a/resources/lang/ru-RU/forms.php b/resources/lang/ru-RU/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Включить зависимости (Google шрифты, трекеры, и др...)',
             'show_timezone'                => 'Show the timezone the status page is running in.',
             'only_disrupted_days'          => 'Показывать только дни, содержащие инциденты на шкале времени?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Код Google Analytics',

diff --git a/resources/lang/sq-AL/forms.php b/resources/lang/sq-AL/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Enable Third Party Dependencies (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Show the timezone the status page is running in.',
             'only_disrupted_days'          => 'Only show days containing incidents in the timeline?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Google Analytics code',

diff --git a/resources/lang/sv-SE/forms.php b/resources/lang/sv-SE/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Enable Third Party Dependencies (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Show the timezone the status page is running in.',
             'only_disrupted_days'          => 'Only show days containing incidents in the timeline?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Google Analytics-kod',

diff --git a/resources/lang/tr-TR/forms.php b/resources/lang/tr-TR/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Enable Third Party Dependencies (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Show the timezone the status page is running in.',
             'only_disrupted_days'          => 'Only show days containing incidents in the timeline?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Google Analytics code',

diff --git a/resources/lang/uk-UA/forms.php b/resources/lang/uk-UA/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Enable Third Party Dependencies (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Show the timezone the status page is running in.',
             'only_disrupted_days'          => 'Only show days containing incidents in the timeline?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Код Google Analytics',

diff --git a/resources/lang/vi-VN/forms.php b/resources/lang/vi-VN/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Enable Third Party Dependencies (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Show the timezone the status page is running in.',
             'only_disrupted_days'          => 'Only show days containing incidents in the timeline?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Mã Google Analytics',

diff --git a/resources/lang/zh-CN/forms.php b/resources/lang/zh-CN/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => '启用第三方服务 (Google Fonts, Tracker 等)',
             'show_timezone'                => '显示状态页所在的时区',
             'only_disrupted_days'          => '仅显示有故障的日期',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Google Analytics 代码',

diff --git a/resources/lang/zh-TW/forms.php b/resources/lang/zh-TW/forms.php
@@ -159,7 +159,6 @@
             'enable_external_dependencies' => 'Enable Third Party Dependencies (Google Fonts, Trackers, etc...)',
             'show_timezone'                => 'Show the timezone the status page is running in.',
             'only_disrupted_days'          => 'Only show days containing incidents in the timeline?',
-            'only_display_incidents'       => 'Only display incidents in the timeline (no matter the date)?',
         ],
         'analytics' => [
             'analytics_google'       => 'Google Analytics 代碼',