diff --git a/app/lang/en/cachet.php b/app/lang/en/cachet.php index fb8abdb1..bd168574 100644 --- a/app/lang/en/cachet.php +++ b/app/lang/en/cachet.php @@ -2,7 +2,7 @@ return [ // Components - 'component' => [ + 'components' => [ 'status' => [ 1 => 'Operational', 2 => 'Performance Issues', @@ -10,76 +10,38 @@ return [ 4 => 'Major Outage', ], ], + // Incidents - 'incident' => [ - 'status' => [ + 'incidents' => [ + 'none' => 'No incidents reported.', + 'past' => 'Past incidents', + 'previous_week' => 'Previous week', + 'next_week' => 'Next week', + 'none' => 'Nothing to report', + 'status' => [ 1 => 'Investigating', 2 => 'Identified', 3 => 'Watching', 4 => 'Fixed', ], - 'none' => 'Nothing to report', ], + // Service Status 'service' => [ 'good' => 'All systems are functional.', 'bad' => 'Some systems are experiencing issues.', ], + + 'api' => [ + 'regenerate' => 'Regenerate API Key', + 'revoke' => 'Revoke API Key', + ], + // Other 'powered_by' => ':app Status Page is powered by Cachet.', 'about_this_site' => 'About this site', - 'login_message' => 'Welcome Back!', - 'login' => 'Login', - 'logout' => 'Logout', - 'logged_in' => 'You\'re logged in.', - 'setup' => 'Setup Cachet', - 'no_incidents' => 'No incidents reported.', - 'past_incidents' => 'Past incidents', - 'previous_week' => 'Previous week', - 'next_week' => 'Next week', - // Dashboard - 'dashboard' => [ - 'dashboard' => 'Dashboard', - 'components' => 'Components', - 'component-add' => 'Add Component', - 'component-groups' => 'Component Groups', - 'component-groups-add' => 'Create Group', - 'incidents' => 'Incidents', - 'incident-add' => 'Add Incident', - 'incident-create-template' => 'Create Template', - 'metrics' => 'Metrics', - 'metrics-add' => 'Add Metric Point', - 'status_page' => 'Status Page', - 'settings' => 'Settings', - 'team' => 'Team Members', - 'team-add' => 'Add Team Member', - 'notifications' => 'Notifications', - 'toggle_navigation' => 'Toggle Navigation', - 'search' => 'Search...', - 'user' => 'User', - 'help' => 'Help', - 'logged_incidents' => '{0} There are no incidents, good work.|You have logged one incident.|You have reported :count incidents.', - 'settings_saved' => 'Settings saved.', - 'settings_not_saved' => 'Settings could not be saved.', - 'not_found' => 'Page Not Found', - 'not_found_title' => 'That page went missing!', - 'not_found_message' => 'Sorry, but the page you are looking for has not been found. Check the URL for errors and try again.', - 'not_found_link' => 'Return to homepage', - ], - // Forms - 'forms' => [ - 'email' => 'Email', - 'password' => 'Password', - // Setup Form - 'setup' => [ - 'service_details' => 'Service Details', - 'status_page_setup' => 'Status Page Setup', - 'site_name' => 'Site Name', - 'site_domain' => 'Site Domain', - 'show_support' => 'Show support for Cachet?', - 'admin_account' => 'Administrator Account', - 'admin_username' => 'Username', - 'finish_setup' => 'Complete Setup', - ], - ], + 'rss-feed' => 'RSS Feed', + 'atom-feed' => 'Atom Feed', + 'feed' => 'Status Feed', + ]; diff --git a/app/lang/en/dashboard.php b/app/lang/en/dashboard.php new file mode 100644 index 00000000..ae500bc1 --- /dev/null +++ b/app/lang/en/dashboard.php @@ -0,0 +1,132 @@ + 'Dashboard', + + // Incidents + 'incidents' => [ + 'incidents' => 'Incidents', + 'logged' => '{0} There are no incidents, good work.|You have logged one incident.|You have reported :count incidents.', + 'incident-create-template' => 'Create Template', + 'add' => [ + 'title' => 'Add an incident', + 'success' => 'Incident added.', + 'failure' => 'Something went wrong with the incident.', + ], + 'edit' => [ + 'title' => 'Edit an incident', + 'success' => 'Incident updated.', + 'failure' => 'Something went wrong with the incident.', + ], + + // Incident templates + 'templates' => [ + 'add' => [ + 'title' => 'Create an incident template', + 'success' => 'Template created.', + 'failure' => 'Something went wrong with the incident template.', + ], + ], + ], + + // Components + 'components' => [ + 'components' => 'Component|Components', + 'component_statuses' => 'Component Statuses', + 'add' => [ + 'title' => 'Create a component', + 'message' => 'You should add a component.', + 'success' => 'Component created.', + 'failure' => 'Something went wrong with the component.', + ], + 'edit' => [ + 'title' => 'Edit a component', + 'success' => 'Component updated.', + 'failure' => 'Something went wrong with the component.', + ], + + // Component groups + 'groups' => [ + 'groups' => 'Component group|Component groups', + 'add' => [ + 'title' => 'Add a component group', + 'success' => 'Component group added.', + 'failure' => 'Something went wrong with the component group.', + ], + ], + ], + + // Metrics + 'metrics' => [ + 'metrics' => 'Metrics', + 'add' => [ + 'title' => 'Create a metric point', + 'success' => 'Metric point created.', + 'failure' => 'Something went wrong with the metric point.', + ], + ], + + // Team + 'team' => [ + 'team' => 'Team', + 'member' => 'Member', + 'profile' => 'Profile', + 'description' => 'Team Members will be able to add, modify & edit components and incidents.', + 'add' => [ + 'title' => 'Add a new team member', + 'success' => 'Team member added.', + 'failure' => 'Something went wrong with the component.', + ], + 'edit' => [ + 'title' => 'Update profile', + 'success' => 'Profile updated.', + 'failure' => 'Something went wrong when updating.', + ], + ], + + // Settings + 'settings' => [ + 'settings' => 'Settings', + 'app-setup' => [ + 'app-setup' => 'Application Setup', + ], + 'security' => [ + 'security' => 'Security', + ], + 'stylesheet' => [ + 'stylesheet' => 'Stylesheet', + ], + 'theme' => [ + 'theme' => 'Theme', + ], + 'edit' => [ + 'success' => 'Settings saved.', + 'failure' => 'Settings could not be saved.', + ], + ], + + // Login + 'login' => [ + 'login' => 'Login', + 'logged_in' => "You're logged in.", + 'welcome' => 'Welcome Back!', + ], + + // Sidebar footer + 'help' => 'Help', + 'status_page' => 'Status Page', + 'logout' => 'Logout', + + // Notifications + 'notifications' => [ + 'notifications' => 'Notifications', + 'awesome' => 'Awesome.', + 'whoops' => 'Whoops.', + ], + + // ? + 'toggle_navigation' => 'Toggle Navigation', + 'search' => 'Search...', + +]; diff --git a/app/lang/en/errors.php b/app/lang/en/errors.php new file mode 100644 index 00000000..38ab0bfe --- /dev/null +++ b/app/lang/en/errors.php @@ -0,0 +1,10 @@ + [ + 'code' => '404', + 'title' => 'That page went missing!', + 'message' => 'Sorry, but the page you are looking for has not been found. Check the URL for errors and try again.', + 'link' => 'Return to homepage', + ] +]; diff --git a/app/lang/en/forms.php b/app/lang/en/forms.php new file mode 100644 index 00000000..9dc7c956 --- /dev/null +++ b/app/lang/en/forms.php @@ -0,0 +1,90 @@ + [ + 'email' => 'Email', + 'username' => 'Username', + 'password' => 'Password', + 'site_name' => 'Site Name', + 'site_domain' => 'Site Domain', + ], + + // Login form fields + 'login' => [ + 'email' => 'Email', + 'password' => 'Password', + ], + + // Incidents form fields + 'incidents' => [ + 'name' => 'Name', + 'status' => 'Status', + 'message' => 'Message', + 'message-help' => 'You may also use Markdown.', + + 'templates' => [ + 'name' => 'Name', + 'template' => 'Template', + ], + ], + + // Components form fields + 'components' => [ + 'name' => 'Name', + 'status' => 'Status', + 'group' => 'Group', + 'description' => 'Description', + 'link' => 'Link', + 'tags' => 'Tags', + 'tags-help' => 'Comma separated.', + + 'groups' => [ + 'name' => 'Name', + ], + ], + + // Settings + 'settings' => [ + /// Application setup + 'app-setup' => [ + 'site-name' => 'Site Name', + 'site-url' => 'Site URL', + '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 .", + ], + 'security' => [ + 'allowed-domains' => 'Allowed domains', + 'allowed-domains-help' => 'Comma separated. The domain set above is automatically allowed by default.', + ], + 'stylesheet' => [ + 'custom-css' => 'Custom Stylesheet', + ], + 'theme' => [ + 'background-color' => 'Background Color', + 'text-color' => 'Text Color', + ], + ], + + 'user' => [ + 'username' => 'Username', + 'email' => 'Email', + 'password' => 'Password', + 'api-key' => 'API Key', + 'api-key-help' => 'Regenerating your API key will revoke all existing applications.', + ], + + // Buttons + 'add' => 'Add', + 'save' => 'Save', + 'update' => 'Update', + 'create' => 'Create', + 'edit' => 'Edit', + 'delete' => 'Delete', + 'submit' => 'Submit', + 'cancel' => 'Cancel', + 'remove' => 'Remove' +]; diff --git a/app/lang/en/setup.php b/app/lang/en/setup.php new file mode 100644 index 00000000..30fb6071 --- /dev/null +++ b/app/lang/en/setup.php @@ -0,0 +1,11 @@ + 'Setup', + 'title' => 'Setup Cachet', + 'service_details' => 'Service Details', + 'status_page_setup' => 'Status Page Setup', + 'show_support' => 'Show support for Cachet?', + 'admin_account' => 'Administrator Account', + 'complete_setup' => 'Complete Setup' +]; diff --git a/app/lang/fr/cachet.php b/app/lang/fr/cachet.php new file mode 100644 index 00000000..c09f5ca1 --- /dev/null +++ b/app/lang/fr/cachet.php @@ -0,0 +1,46 @@ + [ + 'status' => [ + 1 => 'Opérationel', + 2 => 'Problèmes de performances', + 3 => 'Panne partielle', + 4 => 'Panne majeure', + ], + ], + + // Incidents + 'incidents' => [ + 'none' => 'Aucun incident reporté.', + 'past' => 'Incidents précédents', + 'previous_week' => 'Semaine précédente', + 'next_week' => 'Semaine suivante', + 'none' => 'Rien à reporter', + 'status' => [ + 1 => 'Enquête en cours', + 2 => 'Identifié', + 3 => 'Analyse en cours', + 4 => 'Corrigé', + ], + ], + + // Service Status + 'service' => [ + 'good' => 'Tous les systèmes sont fonctionnels.', + 'bad' => 'Certains systèmes rencontrent des problèmes.', + ], + + 'api' => [ + 'regenerate' => 'Regénérer une clé API', + 'revoke' => 'Révoquer cette clé API', + ], + + // Other + 'powered_by' => ':app Status Page est propulsé par Cachet.', + 'about_this_site' => 'À propos de ce site', + 'rss-feed' => 'Flux RSS', + 'atom-feed' => 'Flux Atom', + 'feed' => 'Flux des statuts' +]; diff --git a/app/lang/fr/dashboard.php b/app/lang/fr/dashboard.php new file mode 100644 index 00000000..67c7ecd8 --- /dev/null +++ b/app/lang/fr/dashboard.php @@ -0,0 +1,132 @@ + 'Tableau de bord', + + // Incidents + 'incidents' => [ + 'incidents' => 'Incidents', + 'logged' => '{0} Il n\'y a aucun incident, bien joué !|Vous avez reporté un incident.|Vous avez reporté :count incidents.', + 'incident-create-template' => 'Créer un modèle', + 'add' => [ + 'title' => 'Ajouter un incident', + 'success' => 'Incident ajouté.', + 'failure' => 'Il s\'est passé quelque chose avec cet incident.', + ], + 'edit' => [ + 'title' => 'Éditer un incident', + 'success' => 'Incident mis-à-jour.', + 'failure' => 'Il s\'est passé quelque chose avec cet incident.', + ], + + // Incident templates + 'templates' => [ + 'add' => [ + 'title' => 'Créer un modèle d\'incident', + 'success' => 'Modèle créé.', + 'failure' => 'Il s\'est passé quelque chose avec ce modèle d\'incident.', + ], + ], + ], + + // Components + 'components' => [ + 'components' => 'Composant|Composants', + 'component_statuses' => 'Statut des composants', + 'add' => [ + 'title' => 'Créer un composant', + 'message' => 'Commencez par ajouter un composant.', + 'success' => 'Composant créé.', + 'failure' => 'Il s\'est passé quelque chose avec ce composant.', + ], + 'edit' => [ + 'title' => 'Éditer un composant', + 'success' => 'Composant mis-à-jour.', + 'failure' => 'Il s\'est passé quelque chose avec ce composant.', + ], + + // Component groups + 'groups' => [ + 'groups' => 'Groupe de composants|Groupes de composants', + 'add' => [ + 'title' => 'Ajouter un group de composants', + 'success' => 'Groupe de composants ajouté.', + 'failure' => 'Il s\'est passé quelque chose avec ce composantgroupe de composants.', + ], + ], + ], + + // Metrics + 'metrics' => [ + 'metrics' => 'Point de mesure', + 'add' => [ + 'title' => 'Créer un point de mesure', + 'success' => 'Point de mesure créé.', + 'failure' => 'Il s\'est passé quelque chose avec ce point de mesure.', + ], + ], + + // Team + 'team' => [ + 'team' => 'Équipe', + 'member' => 'Membre', + 'profile' => 'Profil', + 'description' => 'Les membres de l\'équipe pourrons ajouter, modifier & éditer les composants et incidents.', + 'add' => [ + 'title' => 'Ajouter un membre à l\'équipe', + 'success' => 'Membre ajouté.', + 'failure' => 'Il s\'est passé quelque chose avec ce membre.', + ], + 'edit' => [ + 'title' => 'Mettre à jour le profil', + 'success' => 'Profil mis-à-jour.', + 'failure' => 'Il s\'est passé quelque chose en mettant à jour le profil.', + ], + ], + + // Settings + 'settings' => [ + 'settings' => 'Réglages', + 'app-setup' => [ + 'app-setup' => 'Configuration', + ], + 'security' => [ + 'security' => 'Sécurité', + ], + 'stylesheet' => [ + 'stylesheet' => 'Feuille de style', + ], + 'theme' => [ + 'theme' => 'Thème', + ], + 'edit' => [ + 'success' => 'Réglages sauvegardés.', + 'failure' => 'Les réglages n\'ont pas pu être sauvegardés.', + ], + ], + + // Login + 'login' => [ + 'login' => 'Connexion', + 'logged_in' => "Vous êtes connecté.", + 'welcome' => 'Re-bonjour !', + ], + + // Sidebar footer + 'help' => 'Aide', + 'status_page' => 'Statut des services', + 'logout' => 'Déconnexion', + + // Notifications + 'notifications' => [ + 'notifications' => 'Notifications', + 'awesome' => 'Cool.', + 'whoops' => 'Oups.', + ], + + // ? + 'toggle_navigation' => 'Activer/Désactiver la navigation', + 'search' => 'Rechercher...', + +]; diff --git a/app/lang/fr/errors.php b/app/lang/fr/errors.php new file mode 100644 index 00000000..dbe86279 --- /dev/null +++ b/app/lang/fr/errors.php @@ -0,0 +1,10 @@ + [ + 'code' => '404', + 'title' => 'Cette page est manquante !', + 'message' => 'Désolé, mais la page que vous recherchez est introuvable. Vérifier l\'URL et essayez à nouveau.', + 'link' => 'Retour à l\'accueil', + ] +]; diff --git a/app/lang/fr/forms.php b/app/lang/fr/forms.php new file mode 100644 index 00000000..98e672f5 --- /dev/null +++ b/app/lang/fr/forms.php @@ -0,0 +1,90 @@ + [ + 'email' => 'Adresse email', + 'username' => 'Identifiant', + 'password' => 'Mot de passe', + 'site_name' => 'Nom du site', + 'site_domain' => 'Domaine du site', + ], + + // Login form fields + 'login' => [ + 'email' => 'Adresse email', + 'password' => 'Mot de passe', + ], + + // Incidents form fields + 'incidents' => [ + 'name' => 'Nom', + 'status' => 'Statut', + 'message' => 'Message', + 'message-help' => 'Vous pouvez aussi utiliser du Markdown.', + + 'templates' => [ + 'name' => 'Nom', + 'template' => 'Modèle', + ], + ], + + // Components form fields + 'components' => [ + 'name' => 'Nom', + 'status' => 'Statut', + 'group' => 'Groupe', + 'description' => 'Description', + 'link' => 'Lien', + 'tags' => 'Tags', + 'tags-help' => 'Séparé par une virgule.', + + 'groups' => [ + 'name' => 'Nom', + ], + ], + + // Settings + 'settings' => [ + /// Application setup + 'app-setup' => [ + 'site-name' => 'Nom du site', + 'site-url' => 'URL du site', + '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.", + ], + 'security' => [ + 'allowed-domains' => 'Domaines autorisés. ', + 'allowed-domains-help' => 'Séparés par une virgule. Les domaines enregistrés ci-dessus seront automatiquement autorisés par défaut.', + ], + 'stylesheet' => [ + 'custom-css' => 'Feuille de style personnalisée', + ], + 'theme' => [ + 'background-color' => 'Couleur d\'arrière plan', + 'text-color' => 'Couleur du texte', + ], + ], + + 'user' => [ + 'username' => 'Identifiant', + 'email' => 'Adresse email', + 'password' => 'Mot de passe', + 'api-key' => 'Clé API', + 'api-key-help' => 'Regénérer votre clé API révoquera toutes les applications existantes.', + ], + + // Buttons + 'add' => 'Ajouter', + 'save' => 'Sauvegarder', + 'update' => 'Mettre à jour', + 'create' => 'Créer', + 'edit' => 'Éditer', + 'delete' => 'Effacer', + 'submit' => 'Envoyer', + 'cancel' => 'Annuler', + 'remove' => 'Supprimer' +]; diff --git a/app/lang/fr/pagination.php b/app/lang/fr/pagination.php new file mode 100644 index 00000000..9f07a5f9 --- /dev/null +++ b/app/lang/fr/pagination.php @@ -0,0 +1,19 @@ + '« Précédent', + 'next' => 'Suivant »', + +]; diff --git a/app/lang/fr/reminders.php b/app/lang/fr/reminders.php new file mode 100644 index 00000000..0f9ea9e5 --- /dev/null +++ b/app/lang/fr/reminders.php @@ -0,0 +1,22 @@ + 'Les mots de passe doivent contenir 6 caractères minimum et être identique à la confirmation.', + 'user' => 'Nous ne trouvons aucun utilisateur avec cette adresse email.', + 'token' => 'Ce jeton de réinitialisation de mot de passe est invalide.', + 'sent' => 'Rappel de mot de passe envoyé !', + 'reset' => 'Votre mot de passe à été réinitialisé !', + +]; diff --git a/app/lang/fr/setup.php b/app/lang/fr/setup.php new file mode 100644 index 00000000..0e555c6b --- /dev/null +++ b/app/lang/fr/setup.php @@ -0,0 +1,11 @@ + 'Installation', + 'title' => 'Installer Cachet', + 'service_details' => 'Details du service', + 'status_page_setup' => 'Installation de la page de statut', + 'show_support' => 'Montrer votre support pour Cachet ?', + 'admin_account' => 'Compte administrateur', + 'complete_setup' => 'Terminer l\'installation' +]; diff --git a/app/lang/fr/validation.php b/app/lang/fr/validation.php new file mode 100644 index 00000000..7ff1af1d --- /dev/null +++ b/app/lang/fr/validation.php @@ -0,0 +1,104 @@ + "Le champ :attribute doit être accepté.", + "active_url" => "Le champ :attribute n'est pas une URL valide.", + "after" => "Le champ :attribute doit être une date postérieure à :date.", + "alpha" => "Le champ :attribute ne peut contenir que des lettres.", + "alpha_dash" => "Le champ :attribute ne peut contenir que des lettres, chiffres et tirets.", + "alpha_num" => "Le champ :attribute ne peut contenir que des lettres ou des chiffres.", + "array" => "Le champ :attribute doit être un tableau.", + "before" => "Le champ :attribute doit être une date antérieure à :date.", + "between" => [ + "numeric" => "Le champ :attribute doit être entre :min et :max.", + "file" => "Le champ :attribute doit être entre :min et :max kilobytes.", + "string" => "Le champ :attribute doit contenir entre :min et :max caractères.", + "array" => "Le champ :attribute doit avoir entre :min et :max objets.", + ], + "confirmed" => "Le champ :attribute confirmation ne correspond pas.", + "date" => "Le champ :attribute n'est pas une date valide.", + "date_format" => "Le champ :attribute ne correspond pas au format :format.", + "different" => "Le champ :attribute et :other doivent être différents.", + "digits" => "Le champ :attribute doit être composé de :digits chiffres.", + "digits_between" => "Le champ :attribute doit être composé de :min jusqu'à :max chiffres.", + "email" => "Le champ :attribute doit être une adresse email valide.", + "exists" => "Le champ selected :attribute est invalide.", + "image" => "Le champ :attribute doit être une image.", + "in" => "Le champ selected :attribute est invalide.", + "integer" => "Le champ :attribute doit être un entier.", + "ip" => "Le champ :attribute doit être une adresse IP valide.", + "max" => [ + "numeric" => "Le champ :attribute ne doit pas être supérieure à :max.", + "file" => "Le champ :attribute ne doit pas être supérieure à :max kilobytes.", + "string" => "Le champ :attribute ne doit pas être supérieure à :max caractères.", + "array" => "Le champ :attribute ne doit pas avoir plus de :max objets.", + ], + "mimes" => "Le champ :attribute doit être un fichier de type : :values.", + "min" => [ + "numeric" => "Le champ :attribute doit être supérieur à :min.", + "file" => "Le champ :attribute doit être supérieur à :min kilobytes.", + "string" => "Le champ :attribute doit être supérieur à :min caractères.", + "array" => "Le champ :attribute doit avoir au moins :min objets.", + ], + "not_in" => "Le champ sélectionné :attribute est invalide.", + "numeric" => "Le champ :attribute doit être un nombre.", + "regex" => "Le format du champ :attribute est invalide.", + "required" => "Le champ :attribute est obligatoire.", + "required_if" => "Le champ :attribute est obligatoire quand :other est :value.", + "required_with" => "Le champ :attribute est obligatoire quand :values est présent.", + "required_with_all" => "Le champ :attribute est obligatoire quand :values est présent.", + "required_without" => "Le champ :attribute est obligatoire quand :values n'est pas présent.", + "required_without_all" => "Le champ :attribute est obligatoire quand aucun des champs :values n'est présent.", + "same" => "Le champ :attribute et :other doivent être identiques.", + "size" => [ + "numeric" => "La taille du champ :attribute doit être de :size.", + "file" => "Le poids du champ :attribute doit être de :size kilobytes.", + "string" => "Le nombre de caractères du champ :attribute doit être de :size caractères.", + "array" => "Le champ :attribute doit contenir :size objets.", + ], + "unique" => "Le champ :attribute est déjà utilisé.", + "url" => "Le format du champ :attribute est invalide.", + + /* + |-------------------------------------------------------------------------- + | Custom Validation Language Lines + |-------------------------------------------------------------------------- + | + | Here you may specify custom validation messages for attributes using the + | convention "attribute.rule" to name the lines. This makes it quick to + | specify a specific custom language line for a given attribute rule. + | + */ + + 'custom' => [ + 'attribute-name' => [ + 'rule-name' => 'custom-message', + ], + ], + + /* + |-------------------------------------------------------------------------- + | Custom Validation Attributes + |-------------------------------------------------------------------------- + | + | The following language lines are used to swap attribute place-holders + | with something more reader friendly such as E-Mail Address instead + | of "email". This simply helps us make messages a little cleaner. + | + */ + + 'attributes' => [ ], + +]; diff --git a/app/views/auth/login.blade.php b/app/views/auth/login.blade.php index bd7e3eb3..e1e4fdbb 100644 --- a/app/views/auth/login.blade.php +++ b/app/views/auth/login.blade.php @@ -8,27 +8,27 @@ {{ Form::open() }}
- {{ trans('cachet.login_message') }} + {{ trans('dashboard.login.welcome') }} @if(Session::has('error'))

{{ Session::get('error') }}

@endif
- + {{ Form::email('email', Input::old('email'), [ - 'class' => 'form-control', 'placeholder' => trans('cachet.forms.email'), 'required' => 'required' + 'class' => 'form-control', 'placeholder' => trans('forms.login.email'), 'required' => 'required' ]) }}
- + {{ Form::password('password', [ - 'class' => 'form-control', 'placeholder' => trans('cachet.forms.password'), 'required' => 'required' + 'class' => 'form-control', 'placeholder' => trans('forms.login.password'), 'required' => 'required' ]) }}
- +
{{ Form::close() }} diff --git a/app/views/dashboard/components/add.blade.php b/app/views/dashboard/components/add.blade.php index 622add57..f7e2a22f 100644 --- a/app/views/dashboard/components/add.blade.php +++ b/app/views/dashboard/components/add.blade.php @@ -6,9 +6,9 @@ - {{ trans('cachet.dashboard.components') }} + {{ trans_choice('dashboard.components.components', 2) }} - > Create a component + > {{ trans('dashboard.components.add.title') }}
@@ -16,9 +16,9 @@ @if($component = Session::get('component'))
@if($component->isValid()) - Awesome. Component added. + {{ sprintf("%s %s", trans('dashboard.notifications.awesome'), trans('dashboard.components.add.success')) }} @else - Whoops. Something went wrong with the component. {{ $component->getErrors() }} + {{ sprintf("%s %s", trans('dashboard.notifications.whoops'), trans('dashboard.components.add.failure').' '.$component->getErrors()) }} @endif
@endif @@ -26,23 +26,23 @@
- +
- +
- +
- +
- + - Comma separated. + {{ trans('forms.components.tags-help') }}
- - Cancel + + {{ trans('forms.cancel') }}
diff --git a/app/views/dashboard/components/edit.blade.php b/app/views/dashboard/components/edit.blade.php index b816df59..d9e246d8 100644 --- a/app/views/dashboard/components/edit.blade.php +++ b/app/views/dashboard/components/edit.blade.php @@ -6,9 +6,9 @@
- {{ trans('cachet.dashboard.components') }} + {{ trans_choice('dashboard.components.components', 2) }} - > Edit component + > {{ trans('dashboard.components.edit.title') }}
@@ -16,9 +16,9 @@ @if($savedComponent = Session::get('savedComponent'))
@if($savedComponent->isValid()) - Awesome. Component updated. + {{ sprintf("%s %s", trans('dashboard.notifications.awesome'), trans('dashboard.components.edit.success')) }} @else - Whoops. Something went wrong with the component. {{ $savedComponent->getErrors() }} + {{ sprintf("%s %s", trans('dashboard.notifications.whoops'), trans('dashboard.components.edit.failure').' '.$component->getErrors()) }} @endif
@endif @@ -26,19 +26,19 @@
- +
- +
- +
@@ -52,18 +52,18 @@
- +
- + - Comma separated. + {{ trans('forms.components.tags-help') }}
- - Cancel + + {{ trans('forms.cancel') }}
diff --git a/app/views/dashboard/components/add-group.blade.php b/app/views/dashboard/components/groups/add.blade.php similarity index 62% rename from app/views/dashboard/components/add-group.blade.php rename to app/views/dashboard/components/groups/add.blade.php index f09911ee..87b9d433 100644 --- a/app/views/dashboard/components/add-group.blade.php +++ b/app/views/dashboard/components/groups/add.blade.php @@ -6,9 +6,9 @@
- {{ trans('cachet.dashboard.components') }} + {{ trans_choice('dashboard.components.groups.groups', 2) }} - > Create a component group + > {{ trans('dashboard.components.groups.add.title') }}
@@ -16,9 +16,9 @@ @if($group = Session::get('group'))
@if($group->isValid()) - Awesome. Component group created. + {{ sprintf("%s %s", trans('dashboard.notifications.awesome'), trans('dashboard.components.groups.add.success')) }} @else - Whoops. Something went wrong with the group. {{ $group->getErrors() }} + {{ sprintf("%s %s", trans('dashboard.notifications.whoops'), trans('dashboard.components.groups.add.failure').' '.$group->getErrors()) }} @endif
@endif @@ -26,13 +26,13 @@
- +
- - Cancel + + {{ trans('forms.cancel') }}
diff --git a/app/views/dashboard/groups.blade.php b/app/views/dashboard/components/groups/index.blade.php similarity index 77% rename from app/views/dashboard/groups.blade.php rename to app/views/dashboard/components/groups/index.blade.php index 76b5c637..405eb2f1 100644 --- a/app/views/dashboard/groups.blade.php +++ b/app/views/dashboard/components/groups/index.blade.php @@ -8,10 +8,10 @@
- {{ trans('cachet.dashboard.component-groups') }} + {{ trans_choice('dashboard.components.groups.groups', 2) }} - {{ trans('cachet.dashboard.component-groups-add') }} + {{ trans('dashboard.components.groups.add.title') }}
@@ -23,12 +23,12 @@ {{ $group->name }}
- Edit - Delete + {{ trans('forms.edit') }} + {{ trans('forms.delete') }}
@empty -
You should add a component.
+
{{ trans('dashboard.components.add.message') }}
@endforelse diff --git a/app/views/dashboard/components/index.blade.php b/app/views/dashboard/components/index.blade.php index 0d5def3f..fe6b9360 100644 --- a/app/views/dashboard/components/index.blade.php +++ b/app/views/dashboard/components/index.blade.php @@ -8,10 +8,10 @@
- {{ trans('cachet.dashboard.components') }} + {{ trans_choice('dashboard.components.components', 2) }} - {{ trans('cachet.dashboard.component-add') }} + {{ trans('dashboard.components.add.title') }}
@@ -32,13 +32,13 @@ @endif
- Edit - Delete + {{ trans('forms.edit') }} + {{ trans('forms.delete') }}
@empty -
You should add a component.
+
{{ trans('dashboard.components.add.message') }}
@endforelse diff --git a/app/views/dashboard/incidents/add.blade.php b/app/views/dashboard/incidents/add.blade.php index cc4f4246..d3fbd32c 100644 --- a/app/views/dashboard/incidents/add.blade.php +++ b/app/views/dashboard/incidents/add.blade.php @@ -6,9 +6,9 @@ - {{ trans('cachet.dashboard.incident-add') }} + {{ trans('dashboard.incidents.incidents') }} - > Create an Incident + > {{ trans('dashboard.incidents.add.title') }}
@@ -16,9 +16,9 @@ @if($incident = Session::get('incident'))
@if($incident->isValid()) - Awesome. Incident added. + {{ sprintf("%s %s", trans('dashboard.notifications.awesome'), trans('dashboard.incidents.add.success')) }} @else - Whoops. Something went wrong with the incident. + {{ sprintf("%s %s", trans('dashboard.notifications.whoops'), trans('dashboard.incidents.add.failure').' '.$incident->getErrors()) }} @endif
@endif @@ -26,42 +26,42 @@ {{ Form::open(['name' => 'IncidentForm', 'class' => 'form-vertical', 'role' => 'form']) }}
- +
-
+
- + - You may also use Markdown. + {{ trans('forms.incidents.message-help') }}
- - Cancel + + {{ trans('forms.cancel') }} {{ Form::close() }}
diff --git a/app/views/dashboard/incidents/edit.blade.php b/app/views/dashboard/incidents/edit.blade.php index 5605e304..2bd51e3d 100644 --- a/app/views/dashboard/incidents/edit.blade.php +++ b/app/views/dashboard/incidents/edit.blade.php @@ -6,9 +6,9 @@ - {{ trans('cachet.dashboard.incident-add') }} + {{ trans('dashboard.incidents.incidents') }} - > Edit an Incident + > {{ trans('dashboard.incidents.edit.title') }}
@@ -16,43 +16,43 @@ {{ Form::open(['name' => 'IncidentForm', 'class' => 'form-vertical', 'role' => 'form']) }}
- + name}} />
-
+
- - - You may also use Markdown. + + + {{ trans('forms.incidents.message-help') }}
id}} /> - - Cancel + + {{ trans('forms.cancel') }} {{ Form::close() }}
diff --git a/app/views/dashboard/incidents/index.blade.php b/app/views/dashboard/incidents/index.blade.php index 0be72462..38add149 100644 --- a/app/views/dashboard/incidents/index.blade.php +++ b/app/views/dashboard/incidents/index.blade.php @@ -6,17 +6,17 @@ - {{ trans('cachet.dashboard.incidents') }} + {{ trans('dashboard.incidents.incidents') }} - {{ trans('cachet.dashboard.incident-add') }} + {{ trans('dashboard.incidents.add.title') }}
-

{{ trans_choice('cachet.dashboard.logged_incidents', $incidents->count(), ['count' => $incidents->count()]) }}

+

{{ trans_choice('dashboard.incidents.logged', $incidents->count(), ['count' => $incidents->count()]) }}

@foreach($incidents as $incident) @@ -28,8 +28,8 @@ @endif
- Edit - Delete + {{ trans('forms.edit') }} + {{ trans('forms.delete') }}
@endforeach diff --git a/app/views/dashboard/incidents/incident-template.blade.php b/app/views/dashboard/incidents/templates/add.blade.php similarity index 64% rename from app/views/dashboard/incidents/incident-template.blade.php rename to app/views/dashboard/incidents/templates/add.blade.php index 26216adf..be2bf7e1 100644 --- a/app/views/dashboard/incidents/incident-template.blade.php +++ b/app/views/dashboard/incidents/templates/add.blade.php @@ -6,9 +6,9 @@
- {{ trans('cachet.dashboard.incident-add') }} + {{ trans('dashboard.incidents.incidents') }} - > Create an Incident Template + > {{ trans('dashboard.incidents.templates.add.title') }}
@@ -16,9 +16,9 @@ @if($template = Session::get('template'))
@if($template->isValid()) - Awesome. Template added. + {{ sprintf("%s %s", trans('dashboard.notifications.awesome'), trans('dashboard.incidents.templates.add.success')) }} @else - Whoops. Something went wrong with the template. + {{ sprintf("%s %s", trans('dashboard.notifications.whoops'), trans('dashboard.incidents.templates.add.failure').' '.$template->getErrors()) }} @endif
@endif @@ -26,16 +26,16 @@ {{ Form::open(['name' => 'IncidentTemplateForm', 'class' => 'form-vertical', 'role' => 'form']) }}
- +
- +
- + {{ Form::close() }}
diff --git a/app/views/dashboard/index.blade.php b/app/views/dashboard/index.blade.php index 0730a7e2..e1e118f0 100644 --- a/app/views/dashboard/index.blade.php +++ b/app/views/dashboard/index.blade.php @@ -6,24 +6,24 @@ - {{ trans('cachet.dashboard.dashboard') }} + {{ trans('dashboard.dashboard') }}
-

Component Statuses

+

{{ trans('dashboard.components.component_statuses') }}

@forelse($components as $component)
- {{ Form::open(['class' => 'component-inline form-horizontal', 'data-messenger' => 'Component updated.']) }} + {{ Form::open(['class' => 'component-inline form-horizontal', 'data-messenger' => trans('dashboard.components.edit.success')]) }}

{{ $component->name }}

- @foreach(trans('cachet.component.status') as $statusID => $status) + @foreach(trans('cachet.components.status') as $statusID => $status)
@empty -
You should add a component.
+
{{ trans('dashboard.components.add.message') }}
@endforelse
diff --git a/app/views/dashboard/metrics/index.blade.php b/app/views/dashboard/metrics/index.blade.php index b5effc73..d6f196b0 100644 --- a/app/views/dashboard/metrics/index.blade.php +++ b/app/views/dashboard/metrics/index.blade.php @@ -5,11 +5,11 @@
- {{ trans('cachet.dashboard.metrics') }} + {{ trans('dashboard.metrics.metrics') }}
-

Metrics

+

{{ trans('dashboard.metrics.metrics') }}

Eventually this page will show all of the graphs that make up your metrics.

diff --git a/app/views/dashboard/notifications/index.blade.php b/app/views/dashboard/notifications/index.blade.php index 8bf6ab55..ea4f837b 100644 --- a/app/views/dashboard/notifications/index.blade.php +++ b/app/views/dashboard/notifications/index.blade.php @@ -5,11 +5,11 @@
- {{ trans('cachet.dashboard.notifications') }} + {{ trans('dashboard.notifications.notifications') }}
-

Notifications

+

{{ trans('dashboard.notifications.notifications') }}

@stop diff --git a/app/views/dashboard/settings/app-setup.blade.php b/app/views/dashboard/settings/app-setup.blade.php index 0283b152..35f2dc92 100644 --- a/app/views/dashboard/settings/app-setup.blade.php +++ b/app/views/dashboard/settings/app-setup.blade.php @@ -9,10 +9,10 @@
-

Application Setup

+

{{ trans('dashboard.settings.app-setup.app-setup') }}

@if(($saved = Session::get('saved'))) -
{{ trans('cachet.dashboard.settings_saved') }}
+
{{ trans('dashboard.settings.edit.success') }}
@elseif(Session::has('error_message'))
{{ Session::get('error_message') }}
@endif @@ -21,7 +21,7 @@
- +
@@ -29,7 +29,7 @@
- +
@@ -37,7 +37,7 @@
- +
@@ -45,7 +45,7 @@
- +
@@ -53,16 +53,16 @@
- + @if($banner = Setting::get('app_banner')) @endif - It's recommended that you upload files no bigger than 930px wide. + {{ trans('forms.settings.app-setup.banner-help') }}
@@ -71,7 +71,7 @@
- +
diff --git a/app/views/dashboard/settings/security.blade.php b/app/views/dashboard/settings/security.blade.php index 80ab0cc8..b63ece27 100644 --- a/app/views/dashboard/settings/security.blade.php +++ b/app/views/dashboard/settings/security.blade.php @@ -9,22 +9,22 @@
-

Security

+

{{ trans('dashboard.settings.security.security') }}

@if($saved = Session::get('saved')) -
{{ trans('cachet.dashboard.settings_saved') }}
+
{{ trans('dashboard.settings.edit.success') }}
@elseif(Session::has('saved')) -
{{ trans('cachet.dashboard.settings_not_saved') }}
+
{{ trans('dashboard.settings.edit.failure') }}
@endif
- +
- The domain set above is automatically allowed by default. + {{ trans('forms.settings.security.allowed-domains-help') }}
@@ -34,7 +34,7 @@
- +
diff --git a/app/views/dashboard/settings/stylesheet.blade.php b/app/views/dashboard/settings/stylesheet.blade.php index f57480d9..1ac889d8 100644 --- a/app/views/dashboard/settings/stylesheet.blade.php +++ b/app/views/dashboard/settings/stylesheet.blade.php @@ -9,19 +9,19 @@
-

Stylesheet

+

{{ trans('dashboard.settings.stylesheet.stylesheet') }}

@if($saved = Session::get('saved')) -
{{ trans('cachet.dashboard.settings_saved') }}
+
{{ trans('dashboard.settings.edit.success') }}
@elseif(Session::has('saved')) -
{{ trans('cachet.dashboard.settings_not_saved') }}
+
{{ trans('dashboard.settings.edit.failure') }}
@endif
- +
@@ -31,7 +31,7 @@
- +
diff --git a/app/views/dashboard/settings/theme.blade.php b/app/views/dashboard/settings/theme.blade.php index 03bade3e..da5f9cec 100644 --- a/app/views/dashboard/settings/theme.blade.php +++ b/app/views/dashboard/settings/theme.blade.php @@ -9,25 +9,25 @@
-

Theme

+

{{ trans('dashboard.settings.theme.theme') }}

@if($saved = Session::get('saved')) -
{{ trans('cachet.dashboard.settings_saved') }}
+
{{ trans('dashboard.settings.edit.success') }}
@elseif(Session::has('saved')) -
{{ trans('cachet.dashboard.settings_not_saved') }}
+
{{ trans('dashboard.settings.edit.failure') }}
@endif
- +
- +
@@ -59,7 +59,7 @@
- +
diff --git a/app/views/dashboard/team/new.blade.php b/app/views/dashboard/team/add.blade.php similarity index 69% rename from app/views/dashboard/team/new.blade.php rename to app/views/dashboard/team/add.blade.php index 7d9f5fc1..888590f6 100644 --- a/app/views/dashboard/team/new.blade.php +++ b/app/views/dashboard/team/add.blade.php @@ -5,8 +5,8 @@
- - {{ trans('cachet.dashboard.user') }} + + {{ trans('dashboard.team.team') }}
@@ -14,31 +14,31 @@
@if($created = Session::get('created'))
- Awesome. New user has been created. + {{ sprintf("%s %s", trans('dashboard.notifications.awesome'), trans('dashboard.team.add.success')) }}
@elseif($errors = Session::get('errors'))
- Whoops. Something went wrong: {{ $errors }} + {{ sprintf("%s %s", trans('dashboard.notifications.whoops'), trans('dashboard.team.add.failure')) }}
@endif
- +
- +
- +
- +
diff --git a/app/views/dashboard/team/edit.blade.php b/app/views/dashboard/team/edit.blade.php index f64c81ad..0d8aa26f 100644 --- a/app/views/dashboard/team/edit.blade.php +++ b/app/views/dashboard/team/edit.blade.php @@ -6,7 +6,7 @@
- {{ trans('cachet.dashboard.user') }} + {{ trans('dashboard.user.user') }}
@@ -15,9 +15,9 @@ @if($updated = Session::get('updated'))
@if($updated) - Awesome. Profile updated. + {{ sprintf("%s %s", trans('dashboard.notifications.awesome'), trans('dashboard.user.edit.success')) }} @else - Whoops. Something went wrong when updating. + {{ sprintf("%s %s", trans('dashboard.notifications.whoops'), trans('dashboard.user.edit.failure')) }} @endif
@endif @@ -25,22 +25,22 @@
- +
- +
- +
- + @if(Auth::user()->isAdmin) - Revoke API Key + {{ trans('cachet.api.revoke') }} @endif
diff --git a/app/views/dashboard/team/index.blade.php b/app/views/dashboard/team/index.blade.php index 14196255..7a2a028c 100644 --- a/app/views/dashboard/team/index.blade.php +++ b/app/views/dashboard/team/index.blade.php @@ -6,17 +6,17 @@
- {{ trans('cachet.dashboard.team') }} + {{ trans('dashboard.team.team') }} - {{ trans('cachet.dashboard.team-add') }} + {{ trans('dashboard.team.add.title') }}
-

Team Members will be able to add, modify & edit components and incidents.

+

{{ trans('dashboard.team.description') }}

@foreach($teamMembers as $member) diff --git a/app/views/dashboard/user/index.blade.php b/app/views/dashboard/user/index.blade.php index 19c33b3f..55ea17ec 100644 --- a/app/views/dashboard/user/index.blade.php +++ b/app/views/dashboard/user/index.blade.php @@ -6,7 +6,7 @@
- {{ trans('cachet.dashboard.user') }} + {{ trans('dashboard.team.profile') }}
@@ -15,9 +15,9 @@ @if($updated = Session::get('updated'))
@if($updated) - Awesome. Profile updated. + {{ sprintf("%s %s", trans('dashboard.notifications.awesome'), trans('dashboard.user.edit.success')) }} @else - Whoops. Something went wrong when updating. + {{ sprintf("%s %s", trans('dashboard.notifications.whoops'), trans('dashboard.user.edit.failure')) }} @endif
@endif @@ -25,27 +25,27 @@
- +
- +
- +
- + - Regenerating your API key will revoke all existing applications. + {{ trans('forms.user.api-key-help') }}
- - Regenerate API Key + + {{ trans('cachet.api.regenerate') }}
diff --git a/app/views/errors/404.blade.php b/app/views/errors/404.blade.php index 7af5ff78..a6799c06 100644 --- a/app/views/errors/404.blade.php +++ b/app/views/errors/404.blade.php @@ -5,14 +5,14 @@
-

404

-

{{ trans('cachet.dashboard.not_found') }}

+

{{ trans('errors.not-found.code') }}

+

{{ trans('errors.not-found.title') }}

-

{{ trans('cachet.dashboard.not_found_message') }}

+

{{ trans('errors.not-found.message') }}


- {{ trans('cachet.dashboard.not_found_link') }} + {{ trans('errors.not-found.link') }}

diff --git a/app/views/index.blade.php b/app/views/index.blade.php index d63215dc..352a863a 100644 --- a/app/views/index.blade.php +++ b/app/views/index.blade.php @@ -25,7 +25,7 @@ @include('partials.graphs') @endif --}} -

{{ trans('cachet.past_incidents') }}

+

{{ trans('cachet.incidents.past') }}

@foreach($allIncidents as $incidents) @include('partials.incidents', $incidents) @endforeach @@ -35,12 +35,12 @@ diff --git a/app/views/partials/dashboard/sidebar.blade.php b/app/views/partials/dashboard/sidebar.blade.php index 1bc40fc2..9e8a545e 100644 --- a/app/views/partials/dashboard/sidebar.blade.php +++ b/app/views/partials/dashboard/sidebar.blade.php @@ -21,20 +21,20 @@
- +

    -
  • +
    • -
  • +
    • -
  • +
diff --git a/app/views/partials/incidents.blade.php b/app/views/partials/incidents.blade.php index 4dd75e67..d32c8864 100644 --- a/app/views/partials/incidents.blade.php +++ b/app/views/partials/incidents.blade.php @@ -28,7 +28,7 @@ @empty
-

{{ trans('cachet.incident.none') }}

+

{{ trans('cachet.incidents.none') }}

@endforelse diff --git a/app/views/partials/support-link.blade.php b/app/views/partials/support-link.blade.php index 19b2a1df..948090ec 100644 --- a/app/views/partials/support-link.blade.php +++ b/app/views/partials/support-link.blade.php @@ -1,10 +1,10 @@ @if(Setting::get('show_support')) diff --git a/app/views/setup.blade.php b/app/views/setup.blade.php index 2ec70edb..ee9cfaff 100644 --- a/app/views/setup.blade.php +++ b/app/views/setup.blade.php @@ -3,28 +3,28 @@ @section('content')
- {{ trans('cachet.setup') }} + {{ trans('setup.title') }}
-
{{ trans('cachet.forms.setup.service_details') }}
+
{{ trans('setup.service_details') }}
{{ Form::open(['name' => 'SetupForm', 'class' => 'form-vertical', 'role' => 'form']) }}
- {{ trans('cachet.forms.setup.status_page_setup') }} + {{ trans('setup.status_page_setup') }}
- - + + @if($errors->has('settings.app_name')) {{ $errors->first('settings.app_name') }} @endif
- - + + @if($errors->has('settings.app_domain')) {{ $errors->first('settings.app_domain') }} @endif @@ -32,30 +32,30 @@
- Administrator Account + {{ trans("setup.admin_account") }}
- - + + @if($errors->has('user.username')) {{ $errors->first('user.username') }} @endif
- - + + @if($errors->has('user.email')) {{ $errors->first('user.email') }} @endif
- - + + @if($errors->has('user.password')) {{ $errors->first('user.password') }} @endif @@ -65,7 +65,7 @@
- +
{{ Form::close() }}
diff --git a/src/Http/Controllers/AtomController.php b/src/Http/Controllers/AtomController.php index fc7c231c..b4685d0e 100644 --- a/src/Http/Controllers/AtomController.php +++ b/src/Http/Controllers/AtomController.php @@ -19,7 +19,7 @@ class AtomController extends Controller { $feed = Feed::make(); $feed->title = Setting::get('app_name'); - $feed->description = 'Status Feed'; + $feed->description = trans('cachet.feed'); $feed->link = Setting::get('app_domain'); $feed->setDateFormat('datetime'); diff --git a/src/Http/Controllers/DashComponentController.php b/src/Http/Controllers/DashComponentController.php index 059c55bf..f85f874f 100644 --- a/src/Http/Controllers/DashComponentController.php +++ b/src/Http/Controllers/DashComponentController.php @@ -13,24 +13,24 @@ use Illuminate\Support\Facades\View; class DashComponentController extends Controller { protected $subMenu = []; - protected $subTitle = 'Components'; public function __construct() { $this->subMenu = [ 'components' => [ - 'title' => 'Components', + 'title' => trans_choice('dashboard.components.components', 2), 'url' => URL::route('dashboard.components'), 'icon' => 'ion-ios-keypad', 'active' => false, ], 'groups' => [ - 'title' => 'Component Groups', + 'title' => trans_choice('dashboard.components.groups.groups', 2), 'url' => URL::route('dashboard.components.groups'), 'icon' => 'ion-folder', 'active' => false, ], ]; + $this->subTitle = trans_choice('dashboard.components.components', 2); View::share('subTitle', $this->subTitle); View::share('subMenu', $this->subMenu); @@ -48,7 +48,7 @@ class DashComponentController extends Controller $this->subMenu['components']['active'] = true; return View::make('dashboard.components.index')->with([ - 'pageTitle' => 'Components - Dashboard', + 'pageTitle' => trans_choice('dashboard.components.components', 2).' - '.trans('dashboard.dashboard'), 'components' => $components, 'subMenu' => $this->subMenu, ]); @@ -63,8 +63,8 @@ class DashComponentController extends Controller { $this->subMenu['groups']['active'] = true; - return View::make('dashboard.groups')->with([ - 'pageTitle' => 'Component Groups - Dashboard', + return View::make('dashboard.components.groups.index')->with([ + 'pageTitle' => trans_choice('dashboard.components.groups.groups', 2).' - '.trans('dashboard.dashboard'), 'groups' => ComponentGroup::all(), 'subMenu' => $this->subMenu, ]); @@ -82,7 +82,7 @@ class DashComponentController extends Controller $groups = ComponentGroup::all(); return View::make('dashboard.components.edit')->with([ - 'pageTitle' => 'Editing "'.$component->name.'" Component - Dashboard', + 'pageTitle' => '"'.$component->name.'" - '.trans('dashboard.components.edit.title').' - '.trans('dashboard.dashboard'), 'component' => $component, 'groups' => $groups, ]); @@ -113,7 +113,7 @@ class DashComponentController extends Controller $groups = ComponentGroup::all(); return View::make('dashboard.components.add')->with([ - 'pageTitle' => 'Add Component - Dashboard', + 'pageTitle' => trans('dashboard.components.add.title').' - '.trans('dashboard.dashboard'), 'groups' => $groups, ]); } @@ -153,7 +153,7 @@ class DashComponentController extends Controller public function showAddComponentGroup() { return View::make('dashboard.components.add-group')->with([ - 'pageTitle' => 'Create Component Group', + 'pageTitle' => trans('dashboard.components.groups.add.title').' - '.trans('dashboard.dashboard'), ]); } diff --git a/src/Http/Controllers/DashIncidentController.php b/src/Http/Controllers/DashIncidentController.php index 5d0c78a0..a072a278 100644 --- a/src/Http/Controllers/DashIncidentController.php +++ b/src/Http/Controllers/DashIncidentController.php @@ -21,7 +21,7 @@ class DashIncidentController extends Controller $incidents = Incident::orderBy('created_at', 'desc')->get(); return View::make('dashboard.incidents.index')->with([ - 'pageTitle' => 'Incidents - Dashboard', + 'pageTitle' => trans('dashboard.incidents.incidents').' - '.trans('dashboard.dashboard'), 'incidents' => $incidents, ]); } @@ -34,7 +34,7 @@ class DashIncidentController extends Controller public function showAddIncident() { return View::make('dashboard.incidents.add')->with([ - 'pageTitle' => 'Add Incident - Dashboard', + 'pageTitle' => trans('dashboard.incidents.add.title').' - '.trans('dashboard.dashboard'), ]); } @@ -45,8 +45,8 @@ class DashIncidentController extends Controller */ public function showAddIncidentTemplate() { - return View::make('dashboard.incidents.incident-template')->with([ - 'pageTitle' => 'Add Incident Template - Dashboard', + return View::make('dashboard.incidents.templates.add')->with([ + 'pageTitle' => trans('dashboard.incidents.templates.add.title').' - '.trans('dashboard.dashboard'), ]); } @@ -100,7 +100,7 @@ class DashIncidentController extends Controller public function showEditIncidentAction(Incident $incident) { return View::make('dashboard.incidents.edit')->with([ - 'pageTitle' => 'Edit Incident - Dashboard', + 'pageTitle' => trans('dashboard.incidents.edit.title').' - '.trans('dashboard.dashboard'), 'incident' => $incident, ]); } diff --git a/src/Http/Controllers/DashSettingsController.php b/src/Http/Controllers/DashSettingsController.php index bc1860c0..a07ec7d0 100644 --- a/src/Http/Controllers/DashSettingsController.php +++ b/src/Http/Controllers/DashSettingsController.php @@ -18,25 +18,25 @@ class DashSettingsController extends Controller { $this->subMenu = [ 'setup' => [ - 'title' => 'Application Setup', + 'title' => trans('dashboard.settings.app-setup.app-setup'), 'url' => '/dashboard/settings/setup', 'icon' => 'ion-gear-b', 'active' => false, ], 'security' => [ - 'title' => 'Security', + 'title' => trans('dashboard.settings.security.security'), 'url' => '/dashboard/settings/security', 'icon' => 'ion-lock-combination', 'active' => false, ], 'theme' => [ - 'title' => 'Theme', + 'title' => trans('dashboard.settings.theme.theme'), 'url' => '/dashboard/settings/theme', 'icon' => 'ion-paintbrush', 'active' => false, ], 'stylesheet' => [ - 'title' => 'Stylesheet', + 'title' => trans('dashboard.settings.stylesheet.stylesheet'), 'url' => '/dashboard/settings/stylesheet', 'icon' => 'ion-paintbucket', 'active' => false, diff --git a/src/Http/Controllers/DashUserController.php b/src/Http/Controllers/DashUserController.php index d664e296..9692de04 100644 --- a/src/Http/Controllers/DashUserController.php +++ b/src/Http/Controllers/DashUserController.php @@ -19,7 +19,7 @@ class DashUserController extends Controller public function showUser() { return View::make('dashboard.user.index')->with([ - 'pageTitle' => 'User - Dashboard', + 'pageTitle' => trans('dashboard.team.profile').' - '.trans('dashboard.dashboard'), ]); } diff --git a/src/Http/Controllers/DashboardController.php b/src/Http/Controllers/DashboardController.php index 338ab88a..78b2a9d0 100644 --- a/src/Http/Controllers/DashboardController.php +++ b/src/Http/Controllers/DashboardController.php @@ -36,7 +36,7 @@ class DashboardController extends Controller $team = User::all(); return View::make('dashboard.team.index')->with([ - 'pageTitle' => 'Team Members - Dashboard', + 'pageTitle' => trans('dashboard.team.team').' - '.trans('dashboard.dashboard'), 'teamMembers' => $team, ]); } @@ -49,7 +49,7 @@ class DashboardController extends Controller public function showTeamMemberView(User $user) { return View::make('dashboard.team.edit')->with([ - 'pageTitle' => 'Edit User - Dashboard', + 'pageTitle' => trans('dashboard.team.edit.title').' - '.trans('dashboard.dashboard'), 'user' => $user, ]); } @@ -61,8 +61,8 @@ class DashboardController extends Controller */ public function showAddTeamMemberView() { - return View::make('dashboard.team.new')->with([ - 'pageTitle' => 'Add User - Dashboard', + return View::make('dashboard.team.add')->with([ + 'pageTitle' => trans('dashboard.team.add.title').' - '.trans('dashboard.dashboard'), ]); } @@ -108,7 +108,7 @@ class DashboardController extends Controller public function showMetrics() { return View::make('dashboard.metrics.index')->with([ - 'pageTitle' => 'Metrics - Dashboard', + 'pageTitle' => trans('dashboard.metrics.metrics').' - '.trans('dashboard.dashboard'), ]); } @@ -120,7 +120,7 @@ class DashboardController extends Controller public function showNotifications() { return View::make('dashboard.notifications.index')->with([ - 'pageTitle' => 'Notifications - Dashboard', + 'pageTitle' => trans('dashboard.notifications.notifications').' - '.trans('dashboard.dashboard'), ]); } } diff --git a/src/Http/Controllers/RssController.php b/src/Http/Controllers/RssController.php index 652651c5..b819e1a8 100644 --- a/src/Http/Controllers/RssController.php +++ b/src/Http/Controllers/RssController.php @@ -20,7 +20,7 @@ class RssController extends Controller $feed = RssFacade::feed('2.0', 'UTF-8'); $feed->channel([ 'title' => Setting::get('app_name'), - 'description' => 'Status Feed', + 'description' => trans('cachet.feed'), 'link' => Setting::get('app_domain'), ]); diff --git a/src/Http/Controllers/SetupController.php b/src/Http/Controllers/SetupController.php index 93d3106e..c82cd673 100644 --- a/src/Http/Controllers/SetupController.php +++ b/src/Http/Controllers/SetupController.php @@ -31,7 +31,7 @@ class SetupController extends Controller public function getIndex() { return View::make('setup')->with([ - 'pageTitle' => 'Setup', + 'pageTitle' => trans('setup.setup'), ]); } diff --git a/src/Models/Component.php b/src/Models/Component.php index 816eb048..2c2ba8ed 100644 --- a/src/Models/Component.php +++ b/src/Models/Component.php @@ -108,7 +108,7 @@ class Component extends Model implements TransformableInterface */ public function getHumanStatusAttribute() { - return trans('cachet.component.status.'.$this->status); + return trans('cachet.components.status.'.$this->status); } /** diff --git a/src/Models/Incident.php b/src/Models/Incident.php index 30721555..4838d2b7 100644 --- a/src/Models/Incident.php +++ b/src/Models/Incident.php @@ -69,7 +69,7 @@ class Incident extends Model implements TransformableInterface */ public function getHumanStatusAttribute() { - $statuses = trans('cachet.incident.status'); + $statuses = trans('cachet.incidents.status'); return $statuses[$this->status]; }