Merge pull request #3 from CachetHQ/2.4

Update from upstream repo CachetHQ/Cachet
uxen-ab · Jan 16, 2018 · d5b93da · d5b93da
2 parents 81f144d + 5cbd9b8
commit d5b93da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/resources/lang/en/cachet.php b/resources/lang/en/cachet.php
@@ -53,9 +53,9 @@
 
     // Service Status
     'service' => [
-        'good'  => '[0,1]System operational|[2,Inf] All systems are operational',
-        'bad'   => '[0,1]The system is experiencing issues|[2,Inf]Some systems are experiencing issues',
-        'major' => '[0,1]The system is experiencing major issues|[2,Inf]Some systems are experiencing major issues',
+        'good'  => '[0,1]System operational|[2,*] All systems are operational',
+        'bad'   => '[0,1]The system is experiencing issues|[2,*]Some systems are experiencing issues',
+        'major' => '[0,1]The system is experiencing major issues|[2,*]Some systems are experiencing major issues',
     ],
 
     'api' => [

diff --git a/resources/lang/en/dashboard.php b/resources/lang/en/dashboard.php
@@ -18,7 +18,7 @@
     'incidents' => [
         'title'                    => 'Incidents & Maintenance',
         'incidents'                => 'Incidents',
-        'logged'                   => '{0} There are no incidents, good work.|[1] You have logged one incident.|[2, Inf] You have reported <strong>:count</strong> incidents.',
+        'logged'                   => '{0} There are no incidents, good work.|[1] You have logged one incident.|[2,*] You have reported <strong>:count</strong> incidents.',
         'incident-create-template' => 'Create Template',
         'incident-templates'       => 'Incident Templates',
         'updates'                  => [
@@ -74,7 +74,7 @@
     // Incident Maintenance
     'schedule' => [
         'schedule'     => 'Maintenance',
-        'logged'       => '{0} There has been no Maintenance, good work.|[1] You have logged one schedule.|[2,Inf] You have reported <strong>:count</strong> schedules.',
+        'logged'       => '{0} There has been no Maintenance, good work.|[1] You have logged one schedule.|[2,*] You have reported <strong>:count</strong> schedules.',
         'scheduled_at' => 'Scheduled at :timestamp',
         'add'          => [
             'title'   => 'Add Maintenance',