From 39bf9f789c57d274bc22f3de50c93573f11e61d3 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Fri, 3 Apr 2015 17:17:29 +0100 Subject: [PATCH 1/3] Remove small text from language string. --- resources/lang/de/setup.php | 2 +- resources/lang/en/setup.php | 2 +- resources/lang/es/setup.php | 2 +- resources/lang/fr/setup.php | 2 +- resources/lang/pt-BR/setup.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/lang/de/setup.php b/resources/lang/de/setup.php index 88301da6..e81b97ef 100644 --- a/resources/lang/de/setup.php +++ b/resources/lang/de/setup.php @@ -5,7 +5,7 @@ return [ 'title' => 'Setup Cachet', 'service_details' => 'Service Details', 'status_page_setup' => 'Setup der Status-Seite', - 'show_support' => 'Möchten Sie Cachet unterstützen? Dies zeigt einen kleinen Text und Link im Footer an.', + 'show_support' => 'Möchten Sie Cachet unterstützen?', 'admin_account' => 'Administrator-Account', 'complete_setup' => 'Setup abschließen', 'completed' => 'Cachet wurde erfolgreich eingerichtet!', diff --git a/resources/lang/en/setup.php b/resources/lang/en/setup.php index 6a317615..5f0b1bcc 100644 --- a/resources/lang/en/setup.php +++ b/resources/lang/en/setup.php @@ -5,7 +5,7 @@ return [ 'title' => 'Setup Cachet', 'service_details' => 'Service Details', 'status_page_setup' => 'Status Page Setup', - 'show_support' => 'Show support for Cachet? Places a link in the footer linking to Cachet.', + 'show_support' => 'Show support for Cachet?', 'admin_account' => 'Administrator Account', 'complete_setup' => 'Complete Setup', 'completed' => 'Cachet has been configured successfully!', diff --git a/resources/lang/es/setup.php b/resources/lang/es/setup.php index 2034cf2e..196138c6 100644 --- a/resources/lang/es/setup.php +++ b/resources/lang/es/setup.php @@ -5,7 +5,7 @@ return [ 'title' => 'Configurar Cachet', 'service_details' => 'Detalles del servicio', 'status_page_setup' => 'Configuración de la página de estado', - 'show_support' => '¿Mostrar tu apoyo a Cachet? Colocara un enlace en el footer vinculando a Cachet.', + 'show_support' => '¿Mostrar tu apoyo a Cachet?', 'admin_account' => 'Cuenta de administrador', 'complete_setup' => 'Completar configuración', 'completed' => '¡Cachet se ha configurado correctamente!', diff --git a/resources/lang/fr/setup.php b/resources/lang/fr/setup.php index 3fb5cbbf..06042940 100644 --- a/resources/lang/fr/setup.php +++ b/resources/lang/fr/setup.php @@ -5,7 +5,7 @@ return [ 'title' => 'Installer Cachet', 'service_details' => 'Details du service', 'status_page_setup' => 'Installation de la page de statut', - 'show_support' => 'Montrer votre soutien envers Cachet ? Affiche un lien vers Cachet en bas de page.', + 'show_support' => 'Montrer votre soutien envers Cachet ?', 'admin_account' => 'Compte administrateur', 'complete_setup' => 'Terminer l\'installation', 'completed' => 'Cachet a été configuré avec succès !', diff --git a/resources/lang/pt-BR/setup.php b/resources/lang/pt-BR/setup.php index f976709e..e4b1a2b0 100755 --- a/resources/lang/pt-BR/setup.php +++ b/resources/lang/pt-BR/setup.php @@ -5,7 +5,7 @@ return [ 'title' => 'Configurar o Cachet', 'service_details' => 'Detalhes do serviço', 'status_page_setup' => 'Configuração da página de status', - 'show_support' => 'Mostrar apoio ao Cachet? Coloca um link no rodapé direcionando para Cachet.', + 'show_support' => 'Mostrar apoio ao Cachet?', 'admin_account' => 'Conta de administrador', 'complete_setup' => 'Configuração completa', 'completed' => 'Cachet foi configurado com sucesso!', From cee25ba530ac8f749f38774de38ce8236b9091e4 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Fri, 3 Apr 2015 17:17:39 +0100 Subject: [PATCH 2/3] Fix markup. --- resources/views/setup.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/setup.blade.php b/resources/views/setup.blade.php index b698e931..2e3a5c47 100644 --- a/resources/views/setup.blade.php +++ b/resources/views/setup.blade.php @@ -74,13 +74,13 @@
From 92c1d69b16b933bdddfd14c4c88f49ba408714c8 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Fri, 3 Apr 2015 17:29:14 +0100 Subject: [PATCH 3/3] Support GoSquared tracking codes as well. Closes #556. --- resources/lang/de/forms.php | 23 ++++++++++--------- resources/lang/en-UD/forms.php | 4 ++-- resources/lang/en/forms.php | 23 ++++++++++--------- resources/lang/es/forms.php | 23 ++++++++++--------- resources/lang/fr/forms.php | 23 ++++++++++--------- resources/lang/pt-BR/forms.php | 23 ++++++++++--------- .../dashboard/settings/app-setup.blade.php | 10 +++++++- resources/views/partials/analytics.blade.php | 14 +++++++++-- 8 files changed, 83 insertions(+), 60 deletions(-) diff --git a/resources/lang/de/forms.php b/resources/lang/de/forms.php index 2f597b39..27fd8fa7 100644 --- a/resources/lang/de/forms.php +++ b/resources/lang/de/forms.php @@ -71,17 +71,18 @@ return [ 'settings' => [ /// Application setup 'app-setup' => [ - 'site-name' => 'Name der Seite', - 'site-url' => 'URL der Seite', - 'site-timezone' => 'Wählen Sie Ihre Zeitzone', - 'site-locale' => 'Wählen Sie Ihre Sprache', - 'date-format' => 'Datumsformat', - 'display-graphs' => 'Display graphs on status page?', - 'about-this-page' => 'Über diese Seite', - 'days-of-incidents' => 'Wie viele (vergangene) Tage sollen angezeigt werden?', - 'banner' => 'Banner-Bild', - 'banner-help' => "Wählen Sie möglichst ein Bild mit 930 px Breite.", - 'google-analytics' => "Google Analytics Code", + 'site-name' => 'Name der Seite', + 'site-url' => 'URL der Seite', + 'site-timezone' => 'Wählen Sie Ihre Zeitzone', + 'site-locale' => 'Wählen Sie Ihre Sprache', + 'date-format' => 'Datumsformat', + 'display-graphs' => 'Display graphs on status page?', + 'about-this-page' => 'Über diese Seite', + 'days-of-incidents' => 'Wie viele (vergangene) Tage sollen angezeigt werden?', + 'banner' => 'Banner-Bild', + 'banner-help' => "Wählen Sie möglichst ein Bild mit 930 px Breite.", + 'analytics_google' => "Google Analytics Code", + 'analytics_gosquared' => "GoSquared Analytics Code", ], 'security' => [ 'allowed-domains' => 'Erlaubte Domains', diff --git a/resources/lang/en-UD/forms.php b/resources/lang/en-UD/forms.php index 899b3a79..7d602209 100755 --- a/resources/lang/en-UD/forms.php +++ b/resources/lang/en-UD/forms.php @@ -80,8 +80,8 @@ return [ 'about-this-page' => 'crwdns402:0crwdne402:0', 'days-of-incidents' => 'crwdns403:0crwdne403:0', 'banner' => 'crwdns404:0crwdne404:0', - 'banner-help' => "crwdns405:0crwdne405:0", - 'google-analytics' => "crwdns406:0crwdne406:0", + 'banner-help' => 'crwdns405:0crwdne405:0', + 'analytics_google' => 'crwdns406:0crwdne406:0', ], 'security' => [ 'allowed-domains' => 'crwdns407:0crwdne407:0', diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php index 33b5bc8b..0a2a216b 100644 --- a/resources/lang/en/forms.php +++ b/resources/lang/en/forms.php @@ -74,17 +74,18 @@ return [ 'settings' => [ /// Application setup 'app-setup' => [ - 'site-name' => 'Site Name', - 'site-url' => 'Site URL', - 'site-timezone' => 'Site Timezone', - 'site-locale' => 'Site Language', - 'date-format' => 'Date Format', - 'display-graphs' => 'Display graphs on status page?', - 'about-this-page' => 'About this page', - 'days-of-incidents' => 'How many days of incidents to show?', - 'banner' => 'Banner Image', - 'banner-help' => "It's recommended that you upload files no bigger than 930px wide .", - 'google-analytics' => "Google Analytics code", + 'site-name' => 'Site Name', + 'site-url' => 'Site URL', + 'site-timezone' => 'Site Timezone', + 'site-locale' => 'Site Language', + 'date-format' => 'Date Format', + 'display-graphs' => 'Display graphs on status page?', + 'about-this-page' => 'About this page', + 'days-of-incidents' => 'How many days of incidents to show?', + 'banner' => 'Banner Image', + 'banner-help' => "It's recommended that you upload files no bigger than 930px wide .", + 'analytics_google' => "Google Analytics Code", + 'analytics_gosquared' => "GoSquared Analytics Code", ], 'security' => [ 'allowed-domains' => 'Allowed domains', diff --git a/resources/lang/es/forms.php b/resources/lang/es/forms.php index 328dace9..a8ac51a4 100644 --- a/resources/lang/es/forms.php +++ b/resources/lang/es/forms.php @@ -72,17 +72,18 @@ return [ 'settings' => [ /// Application setup 'app-setup' => [ - 'site-name' => 'Nombre del sitio', - 'site-url' => 'URL del sitio', - 'site-timezone' => 'Zona horaria del sitio', - 'site-locale' => 'Idioma del sitio', - 'date-format' => 'Formato de la fecha', - 'display-graphs' => '¿Visualizar gráficas en la página de estado?', - 'about-this-page' => 'Sobre esta página', - 'days-of-incidents' => '¿Cuántos días de incidentes mostrar?', - 'banner' => 'Imagen de inicio', - 'banner-help' => "Se recomienda subir una imagen no más grande de 930px de ancho .", - 'google-analytics' => "Código de Google Analytics", + 'site-name' => 'Nombre del sitio', + 'site-url' => 'URL del sitio', + 'site-timezone' => 'Zona horaria del sitio', + 'site-locale' => 'Idioma del sitio', + 'date-format' => 'Formato de la fecha', + 'display-graphs' => '¿Visualizar gráficas en la página de estado?', + 'about-this-page' => 'Sobre esta página', + 'days-of-incidents' => '¿Cuántos días de incidentes mostrar?', + 'banner' => 'Imagen de inicio', + 'banner-help' => "Se recomienda subir una imagen no más grande de 930px de ancho .", + 'analytics_google' => "Google Analytics Code", + 'analytics_gosquared' => "GoSquared Analytics Code", ], 'security' => [ 'allowed-domains' => 'Dominios permitidos', diff --git a/resources/lang/fr/forms.php b/resources/lang/fr/forms.php index ac023203..0801f9e6 100644 --- a/resources/lang/fr/forms.php +++ b/resources/lang/fr/forms.php @@ -71,17 +71,18 @@ return [ 'settings' => [ /// Application setup 'app-setup' => [ - 'site-name' => 'Nom du site', - 'site-url' => 'URL du site', - 'site-timezone' => 'Fuseau horaire du site', - 'site-locale' => 'Langue du site', - 'date-format' => 'Format de date', - 'display-graphs' => 'Display graphs on status page?', - 'about-this-page' => 'À propos de cette page', - 'days-of-incidents' => 'Nombre de jours à afficher ?', - 'banner' => 'Bannière', - 'banner-help' => "Il est recommandé de télécharger des fichiers de moins de 930 pixels de large.", - 'google-analytics' => "Google Analytics code", + 'site-name' => 'Nom du site', + 'site-url' => 'URL du site', + 'site-timezone' => 'Fuseau horaire du site', + 'site-locale' => 'Langue du site', + 'date-format' => 'Format de date', + 'display-graphs' => 'Display graphs on status page?', + 'about-this-page' => 'À propos de cette page', + 'days-of-incidents' => 'Nombre de jours à afficher ?', + 'banner' => 'Bannière', + 'banner-help' => "Il est recommandé de télécharger des fichiers de moins de 930 pixels de large.", + 'analytics_google' => "Google Analytics Code", + 'analytics_gosquared' => "GoSquared Analytics Code", ], 'security' => [ 'allowed-domains' => 'Domaines autorisés. ', diff --git a/resources/lang/pt-BR/forms.php b/resources/lang/pt-BR/forms.php index f9b75a23..75861744 100755 --- a/resources/lang/pt-BR/forms.php +++ b/resources/lang/pt-BR/forms.php @@ -74,17 +74,18 @@ return [ 'settings' => [ /// Application setup 'app-setup' => [ - 'site-name' => 'Nome do site', - 'site-url' => 'URL do site', - 'site-timezone' => 'Fuso horário do site', - 'site-locale' => 'Idioma do site', - 'date-format' => 'Formato da Data', - 'display-graphs' => '', - '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 .", - 'google-analytics' => "Código do Google Analytics", + 'site-name' => 'Nome do site', + 'site-url' => 'URL do site', + 'site-timezone' => 'Fuso horário do site', + 'site-locale' => 'Idioma do site', + 'date-format' => 'Formato da Data', + 'display-graphs' => '', + '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 .", + 'analytics_google' => "Google Analytics Code", + 'analytics_gosquared' => "GoSquared Analytics Code", ], 'security' => [ 'allowed-domains' => 'Domínios permitidos', diff --git a/resources/views/dashboard/settings/app-setup.blade.php b/resources/views/dashboard/settings/app-setup.blade.php index fdd6e714..203bc1f9 100644 --- a/resources/views/dashboard/settings/app-setup.blade.php +++ b/resources/views/dashboard/settings/app-setup.blade.php @@ -46,11 +46,19 @@
- +
+
+
+
+ + +
+
+
diff --git a/resources/views/partials/analytics.blade.php b/resources/views/partials/analytics.blade.php index b50a7be3..f5ba8076 100644 --- a/resources/views/partials/analytics.blade.php +++ b/resources/views/partials/analytics.blade.php @@ -1,10 +1,20 @@ -@if($googleId = Setting::get('app_analytics')) +@if($googleTracking = Setting::get('app_analytics')) @endif +@if($gosquaredTracking = Setting::get('app_analytics_gs')) + +@endif