From 309a3f96efdc66a86896d480883701c3cf8a74f9 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 25 Jul 2016 19:25:05 +0100 Subject: [PATCH 1/2] Revert "Don't use settings caching in cli" --- app/Foundation/Providers/ConfigServiceProvider.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/Foundation/Providers/ConfigServiceProvider.php b/app/Foundation/Providers/ConfigServiceProvider.php index f088cb44..ee476356 100644 --- a/app/Foundation/Providers/ConfigServiceProvider.php +++ b/app/Foundation/Providers/ConfigServiceProvider.php @@ -35,10 +35,9 @@ class ConfigServiceProvider extends ServiceProvider public function boot() { $env = $this->app->environment(); - $cli = $this->app->runningInConsole(); $repo = $this->app->make(Repository::class); $cache = $this->app->make(Cache::class); - $loaded = $cli ? false : $cache->load($env); + $loaded = $cache->load($env); $this->app->terminating(function () use ($repo, $cache) { if ($repo->stale()) { @@ -47,7 +46,7 @@ class ConfigServiceProvider extends ServiceProvider }); try { - if ($cli === false && $loaded === false) { + if ($loaded === false) { $loaded = $repo->all(); $cache->store($env, $loaded); } From aea18a51c276b6eb4ae4164de925954a21ab857c Mon Sep 17 00:00:00 2001 From: James Brooks Date: Mon, 25 Jul 2016 21:42:49 +0100 Subject: [PATCH 2/2] Sync languages --- resources/lang/cs/forms.php | 2 +- resources/lang/da/forms.php | 2 +- resources/lang/de/forms.php | 2 +- resources/lang/en-UD/cachet.php | 4 ++-- resources/lang/en-UD/forms.php | 2 +- resources/lang/es/forms.php | 2 +- resources/lang/fr/forms.php | 2 +- resources/lang/id/forms.php | 2 +- resources/lang/it/forms.php | 2 +- resources/lang/ja/forms.php | 2 +- resources/lang/ko/forms.php | 2 +- resources/lang/nl/forms.php | 2 +- resources/lang/no/forms.php | 2 +- resources/lang/pl/forms.php | 2 +- resources/lang/pt-BR/forms.php | 2 +- resources/lang/pt-PT/forms.php | 2 +- resources/lang/ru/forms.php | 2 +- resources/lang/sv-SE/forms.php | 2 +- resources/lang/vi/forms.php | 2 +- resources/lang/zh-TW/forms.php | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/resources/lang/cs/forms.php b/resources/lang/cs/forms.php index e3e5a103..32f5685e 100644 --- a/resources/lang/cs/forms.php +++ b/resources/lang/cs/forms.php @@ -107,7 +107,7 @@ return [ 'about-this-page' => 'O této stránce', 'days-of-incidents' => 'Kolik dní incidentů zobrazovat?', 'banner' => 'Banner Image', - 'banner-help' => 'Doručuje se nenahrávat soubory větší než 930 pixelů na šířku.', + 'banner-help' => "Doručuje se nenahrávat soubory větší než 930 pixelů na šířku.", 'subscribers' => 'Umožnit lidem, aby se přihlašovali k odběru e-mailových upozornění?', 'automatic_localization' => 'Automatically localise your status page to your visitor\'s language?', ], diff --git a/resources/lang/da/forms.php b/resources/lang/da/forms.php index 4875cd0e..e74550f3 100644 --- a/resources/lang/da/forms.php +++ b/resources/lang/da/forms.php @@ -107,7 +107,7 @@ return [ 'about-this-page' => 'Om', 'days-of-incidents' => 'Hvor mange dage skal der vises hændelser for?', 'banner' => 'Banner billede', - 'banner-help' => 'Det anbefales ikke at uploade billeder bredere end 930px.', + 'banner-help' => "Det anbefales ikke at uploade billeder bredere end 930px.", 'subscribers' => 'Tillad folk at tilmelde sig email underretninger?', 'automatic_localization' => 'Automatically localise your status page to your visitor\'s language?', ], diff --git a/resources/lang/de/forms.php b/resources/lang/de/forms.php index 3eca40e1..0ac8dfb9 100644 --- a/resources/lang/de/forms.php +++ b/resources/lang/de/forms.php @@ -107,7 +107,7 @@ return [ 'about-this-page' => 'Über diese Seite', 'days-of-incidents' => 'Wie viele Tage mit Vorfällen sollen gezeigt werden?', 'banner' => 'Banner Bild', - 'banner-help' => 'Es wird empfohlen, dass Sie keine Dateien die breiter als 930 Pixel sind hochladen .', + 'banner-help' => "Es wird empfohlen, dass Sie keine Dateien die breiter als 930 Pixel sind hochladen .", 'subscribers' => 'Personen die Anmeldung für E-Mail-Benachrichtigung erlauben?', 'automatic_localization' => 'Die Status-Seite automatisch auf die Sprache deiner Besucher anpassen?', ], diff --git a/resources/lang/en-UD/cachet.php b/resources/lang/en-UD/cachet.php index 64dfda79..ca357426 100644 --- a/resources/lang/en-UD/cachet.php +++ b/resources/lang/en-UD/cachet.php @@ -81,7 +81,7 @@ return [ 'failure' => 'crwdns496:0crwdne496:0', 'already-subscribed' => 'crwdns626:0crwdne626:0', 'verify' => [ - 'text' => 'crwdns776:0crwdne776:0', + 'text' => "crwdns776:0crwdne776:0", 'html' => 'crwdns777:0crwdne777:0', 'button' => 'crwdns778:0crwdne778:0', ], @@ -103,7 +103,7 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => 'crwdns553:0crwdne553:0', + 'text' => "crwdns553:0crwdne553:0", 'html' => 'crwdns555:0crwdne555:0', ], ], diff --git a/resources/lang/en-UD/forms.php b/resources/lang/en-UD/forms.php index d5cc70fe..c4e48ff3 100644 --- a/resources/lang/en-UD/forms.php +++ b/resources/lang/en-UD/forms.php @@ -107,7 +107,7 @@ return [ 'about-this-page' => 'crwdns402:0crwdne402:0', 'days-of-incidents' => 'crwdns403:0crwdne403:0', 'banner' => 'crwdns717:0crwdne717:0', - 'banner-help' => 'crwdns405:0crwdne405:0', + 'banner-help' => "crwdns405:0crwdne405:0", 'subscribers' => 'crwdns513:0crwdne513:0', 'automatic_localization' => 'crwdns726:0crwdne726:0', ], diff --git a/resources/lang/es/forms.php b/resources/lang/es/forms.php index 450f21d8..a8bcad22 100644 --- a/resources/lang/es/forms.php +++ b/resources/lang/es/forms.php @@ -107,7 +107,7 @@ return [ 'about-this-page' => 'Sobre esta página', 'days-of-incidents' => '¿Cuántos días de incidentes mostrar?', 'banner' => 'Imagen del banner', - 'banner-help' => 'Se recomienda subir una imagen no más grande de 930px de ancho .', + 'banner-help' => "Se recomienda subir una imagen no más grande de 930px de ancho .", 'subscribers' => '¿Permitir a la gente inscribirse mediante noficiacion por correo electronico?', 'automatic_localization' => '¿Traducir automáticamente la página de estado según el lenguaje del visitante?', ], diff --git a/resources/lang/fr/forms.php b/resources/lang/fr/forms.php index 46bea63c..75433e16 100644 --- a/resources/lang/fr/forms.php +++ b/resources/lang/fr/forms.php @@ -107,7 +107,7 @@ return [ 'about-this-page' => 'À propos de cette page', 'days-of-incidents' => 'Combien de jours d\'incidents à montrer ?', 'banner' => 'Image d\'en-tête', - 'banner-help' => 'Il est recommandé de téléchargez un fichier ne dépassant pas 930px de large .', + 'banner-help' => "Il est recommandé de téléchargez un fichier ne dépassant pas 930px de large .", 'subscribers' => 'Permettre aux personnes de s\'inscrire aux notifications par e-mail ?', 'automatic_localization' => 'Traduire automatiquement votre page de statut dans la langue du visiteur ?', ], diff --git a/resources/lang/id/forms.php b/resources/lang/id/forms.php index 1d6721a6..6df1bd60 100644 --- a/resources/lang/id/forms.php +++ b/resources/lang/id/forms.php @@ -107,7 +107,7 @@ return [ 'about-this-page' => 'Tentang halaman ini', 'days-of-incidents' => 'Berapa hari insiden akan ditampilkan?', 'banner' => 'Banner Image', - 'banner-help' => 'Disarankan gambar yang anda unggah tidak lebih lebar dari 930px.', + 'banner-help' => "Disarankan gambar yang anda unggah tidak lebih lebar dari 930px.", 'subscribers' => 'Bolehkan pengunjung mendaftar notifikasi email?', 'automatic_localization' => 'Automatically localise your status page to your visitor\'s language?', ], diff --git a/resources/lang/it/forms.php b/resources/lang/it/forms.php index 685a1e2f..a6e29849 100644 --- a/resources/lang/it/forms.php +++ b/resources/lang/it/forms.php @@ -107,7 +107,7 @@ return [ 'about-this-page' => 'Informazioni sulla pagina', 'days-of-incidents' => 'Quanti giorni di segnalazioni mostrare?', 'banner' => 'Immagine del banner', - 'banner-help' => 'È consigliabile caricare file larghi non più di 930px.', + 'banner-help' => "È consigliabile caricare file larghi non più di 930px.", 'subscribers' => 'Permettere alle persone di iscriversi alle notifiche via email?', 'automatic_localization' => 'Tradurre automaticamente la tua pagina di stato nella lingua del visitatore?', ], diff --git a/resources/lang/ja/forms.php b/resources/lang/ja/forms.php index 2e509548..8f0e7ee1 100644 --- a/resources/lang/ja/forms.php +++ b/resources/lang/ja/forms.php @@ -107,7 +107,7 @@ return [ 'about-this-page' => 'このページについて', 'days-of-incidents' => '何日間のインシデントを表示しますか？', 'banner' => 'Banner Image', - 'banner-help' => '横幅が930px以内の画像をアップロードしてください。', + 'banner-help' => "横幅が930px以内の画像をアップロードしてください。", 'subscribers' => 'Allow people to signup to email notifications?', 'automatic_localization' => 'Automatically localise your status page to your visitor\'s language?', ], diff --git a/resources/lang/ko/forms.php b/resources/lang/ko/forms.php index 3f3de773..c79326f1 100644 --- a/resources/lang/ko/forms.php +++ b/resources/lang/ko/forms.php @@ -107,7 +107,7 @@ return [ 'about-this-page' => '이 페이지에 대하여', 'days-of-incidents' => '몇 일 동안 사건을 표시하시겠습니까?', 'banner' => 'Banner Image', - 'banner-help' => '가로가 930 픽셀보다 작은 이미지를 업로드 하는 것을 권장합니다.', + 'banner-help' => "가로가 930 픽셀보다 작은 이미지를 업로드 하는 것을 권장합니다.", 'subscribers' => '이메일 알림을 받기 위한 회원가입 허용', 'automatic_localization' => 'Automatically localise your status page to your visitor\'s language?', ], diff --git a/resources/lang/nl/forms.php b/resources/lang/nl/forms.php index cd1b47b0..043a3f50 100644 --- a/resources/lang/nl/forms.php +++ b/resources/lang/nl/forms.php @@ -107,7 +107,7 @@ return [ 'about-this-page' => 'Over deze pagina', 'days-of-incidents' => 'Hoeveel dagen moeten incidenten getoond worden?', 'banner' => 'Banner afbeelding', - 'banner-help' => 'Het wordt aanbevolen dat u geen bestanden upload die breeder zijn dan 930px.', + 'banner-help' => "Het wordt aanbevolen dat u geen bestanden upload die breeder zijn dan 930px.", 'subscribers' => 'Bezoekers toestaan om te abonneren op e-mail notificaties?', 'automatic_localization' => 'Stel de taal van de bezoeker in als standaardtaal voor deze bezoeker?', ], diff --git a/resources/lang/no/forms.php b/resources/lang/no/forms.php index 76640cff..e80b48dc 100644 --- a/resources/lang/no/forms.php +++ b/resources/lang/no/forms.php @@ -107,7 +107,7 @@ return [ 'about-this-page' => 'Om denne siden', 'days-of-incidents' => 'How many days of incidents to show?', 'banner' => 'Banner Image', - 'banner-help' => 'Det anbefales at du ikke laster opp bilder bredere enn 930 piksler.', + 'banner-help' => "Det anbefales at du ikke laster opp bilder bredere enn 930 piksler.", 'subscribers' => 'Tillatt brukere å melde seg inn for epostvarslinger?', 'automatic_localization' => 'Automatically localise your status page to your visitor\'s language?', ], diff --git a/resources/lang/pl/forms.php b/resources/lang/pl/forms.php index 5b8a8593..aba84ada 100644 --- a/resources/lang/pl/forms.php +++ b/resources/lang/pl/forms.php @@ -107,7 +107,7 @@ return [ 'about-this-page' => 'Über diese Seite', 'days-of-incidents' => 'Wie viele Tage mit Vorfällen sollen gezeigt werden?', 'banner' => 'Banner', - 'banner-help' => 'Es wird empfohlen, dass Sie keine Dateien die breiter als 930 Pixel sind hochladen .', + 'banner-help' => "Es wird empfohlen, dass Sie keine Dateien die breiter als 930 Pixel sind hochladen .", 'subscribers' => 'Personen die Anmeldung für E-Mail-Benachrichtigung erlauben?', 'automatic_localization' => 'Automatycznie tłumaczyć twoją stronę statusu na język odwiedzającego?', ], diff --git a/resources/lang/pt-BR/forms.php b/resources/lang/pt-BR/forms.php index 8a7f79a5..4247a50f 100644 --- a/resources/lang/pt-BR/forms.php +++ b/resources/lang/pt-BR/forms.php @@ -107,7 +107,7 @@ return [ 'about-this-page' => 'Sobre esta página', 'days-of-incidents' => 'Quantos dias de incidentes para mostrar?', 'banner' => 'Imagem do banner', - 'banner-help' => 'É recomendável que você faça upload de arquivos menores que 930px .', + 'banner-help' => "É recomendável que você faça upload de arquivos menores que 930px .", 'subscribers' => 'Permitir que outras pessoas se cadastrem para notificações via e-mail?', 'automatic_localization' => 'Localizar sua página de status de acordo com o idioma do visitante automaticamente?', ], diff --git a/resources/lang/pt-PT/forms.php b/resources/lang/pt-PT/forms.php index ddecf9a3..21bc39ef 100644 --- a/resources/lang/pt-PT/forms.php +++ b/resources/lang/pt-PT/forms.php @@ -107,7 +107,7 @@ return [ 'about-this-page' => 'Sobre esta página', 'days-of-incidents' => 'Quantos dias de incidentes para mostrar?', 'banner' => 'Banner Image', - 'banner-help' => 'É recomendável que você faça upload de arquivos menores que 930px .', + 'banner-help' => "É recomendável que você faça upload de arquivos menores que 930px .", 'subscribers' => 'Permitir que as pessoas subscrevam as notificações?', 'automatic_localization' => 'Automatically localise your status page to your visitor\'s language?', ], diff --git a/resources/lang/ru/forms.php b/resources/lang/ru/forms.php index 4b49c2d6..6e056012 100644 --- a/resources/lang/ru/forms.php +++ b/resources/lang/ru/forms.php @@ -107,7 +107,7 @@ return [ 'about-this-page' => 'Об этой странице', 'days-of-incidents' => 'За сколько дней показывать инциденты?', 'banner' => 'Картинка-баннер', - 'banner-help' => 'Рекомендуется загружать картинки не больше 930 пикс. в ширину.', + 'banner-help' => "Рекомендуется загружать картинки не больше 930 пикс. в ширину.", 'subscribers' => 'Разрешить посетителям подписываться на email-уведомления?', 'automatic_localization' => 'Автоматически переводить сайт на язык посетителя?', ], diff --git a/resources/lang/sv-SE/forms.php b/resources/lang/sv-SE/forms.php index 56dd1579..26a32352 100644 --- a/resources/lang/sv-SE/forms.php +++ b/resources/lang/sv-SE/forms.php @@ -107,7 +107,7 @@ return [ 'about-this-page' => 'Om den här sidan', 'days-of-incidents' => 'Hur många dagar av händelser ska visas?', 'banner' => 'Banner Image', - 'banner-help' => 'Vi rekommenderar att du inte laddar upp bilder som är bredare än 930 px.', + 'banner-help' => "Vi rekommenderar att du inte laddar upp bilder som är bredare än 930 px.", 'subscribers' => 'Tillåt att registrera sig för notifikationer via e-post?', 'automatic_localization' => 'Automatically localise your status page to your visitor\'s language?', ], diff --git a/resources/lang/vi/forms.php b/resources/lang/vi/forms.php index 1df3dcab..ce9fa047 100644 --- a/resources/lang/vi/forms.php +++ b/resources/lang/vi/forms.php @@ -107,7 +107,7 @@ return [ 'about-this-page' => 'Về trang này', 'days-of-incidents' => 'Sự cố này sẽ hiển thị mấy ngày ?', 'banner' => 'Banner Image', - 'banner-help' => 'Bạn nên upload ảnh có chiều rộng lớn hơn 930px', + 'banner-help' => "Bạn nên upload ảnh có chiều rộng lớn hơn 930px", 'subscribers' => 'Allow people to signup to email notifications?', 'automatic_localization' => 'Automatically localise your status page to your visitor\'s language?', ], diff --git a/resources/lang/zh-TW/forms.php b/resources/lang/zh-TW/forms.php index 7d4bb127..d61adf43 100644 --- a/resources/lang/zh-TW/forms.php +++ b/resources/lang/zh-TW/forms.php @@ -107,7 +107,7 @@ return [ 'about-this-page' => '關於本站', 'days-of-incidents' => '顯示多少天前的事件？', 'banner' => 'Banner Image', - 'banner-help' => '橫幅寬度建議少於 930px 。', + 'banner-help' => "橫幅寬度建議少於 930px 。", 'subscribers' => '允許用戶訂閱郵件通知嗎?', 'automatic_localization' => 'Automatically localise your status page to your visitor\'s language?', ],