From 2a94965bb6d88aa3bdfbdde847d92ef9f14c546a Mon Sep 17 00:00:00 2001 From: James Brooks Date: Fri, 22 May 2015 17:06:18 +0100 Subject: [PATCH 1/2] Updates en-UD for incontext localization. --- resources/lang/en-UD/dashboard.php | 11 ++- resources/lang/en-UD/errors.php | 11 --- resources/lang/en-UD/forms.php | 47 ++++++----- resources/lang/en-UD/pagination.php | 11 --- resources/lang/en-UD/reminders.php | 11 --- resources/lang/en-UD/setup.php | 2 +- resources/lang/en-UD/validation.php | 121 +++++++++++++--------------- 7 files changed, 91 insertions(+), 123 deletions(-) diff --git a/resources/lang/en-UD/dashboard.php b/resources/lang/en-UD/dashboard.php index 88316e9f..342cbb64 100755 --- a/resources/lang/en-UD/dashboard.php +++ b/resources/lang/en-UD/dashboard.php @@ -73,6 +73,7 @@ return [ 'components' => [ 'components' => 'crwdns431:0crwdne431:0', 'component_statuses' => 'crwdns321:0crwdne321:0', + 'listed_group' => 'crwdns473:0crwdne473:0', 'add' => [ 'title' => 'crwdns322:0crwdne322:0', 'message' => 'crwdns323:0crwdne323:0', @@ -87,8 +88,9 @@ return [ // Component groups 'groups' => [ - 'groups' => 'crwdns329:0crwdne329:0', - 'add' => [ + 'groups' => 'crwdns329:0crwdne329:0', + 'no_components' => 'crwdns478:0crwdne478:0', + 'add' => [ 'title' => 'crwdns330:0crwdne330:0', 'success' => 'crwdns331:0crwdne331:0', 'failure' => 'crwdns332:0crwdne332:0', @@ -143,7 +145,8 @@ return [ 'too-big' => 'crwdns347:0crwdne347:0', ], 'security' => [ - 'security' => 'crwdns348:0crwdne348:0', + 'security' => 'crwdns348:0crwdne348:0', + 'two-factor' => 'crwdns474:0crwdne474:0', ], 'stylesheet' => [ 'stylesheet' => 'crwdns349:0crwdne349:0', @@ -188,7 +191,7 @@ return [ 'customize' => 'crwdns432:0crwdne432:0', 'team' => 'crwdns433:0crwdne433:0', 'api' => 'crwdns434:0crwdne434:0', - 'two-factor' => 'crwdns435:0crwdne435:0', + 'two-factor' => 'crwdns479:0crwdne479:0', ], ], diff --git a/resources/lang/en-UD/errors.php b/resources/lang/en-UD/errors.php index eb692d67..4a0c72a9 100755 --- a/resources/lang/en-UD/errors.php +++ b/resources/lang/en-UD/errors.php @@ -1,16 +1,5 @@ - * (c) Joseph Cohen - * (c) Graham Campbell - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - return [ 'not-found' => [ 'code' => 'crwdns208:0crwdne208:0', diff --git a/resources/lang/en-UD/forms.php b/resources/lang/en-UD/forms.php index 974c016f..f137b8d0 100755 --- a/resources/lang/en-UD/forms.php +++ b/resources/lang/en-UD/forms.php @@ -32,18 +32,22 @@ return [ '2fauth' => 'crwdns382:0crwdne382:0', 'invalid' => 'crwdns383:0crwdne383:0', 'invalid-token' => 'crwdns384:0crwdne384:0', + 'cookies' => 'crwdns480:0crwdne480:0', ], // Incidents form fields 'incidents' => [ - 'name' => 'crwdns219:0crwdne219:0', - 'status' => 'crwdns385:0crwdne385:0', - 'component' => 'crwdns386:0crwdne386:0', - 'message' => 'crwdns387:0crwdne387:0', - 'message-help' => 'crwdns388:0crwdne388:0', - 'scheduled_at' => 'crwdns464:0crwdne464:0', - - 'templates' => [ + 'name' => 'crwdns219:0crwdne219:0', + 'status' => 'crwdns385:0crwdne385:0', + 'component' => 'crwdns386:0crwdne386:0', + 'message' => 'crwdns387:0crwdne387:0', + 'message-help' => 'crwdns388:0crwdne388:0', + 'scheduled_at' => 'crwdns464:0crwdne464:0', + 'incident_time' => 'crwdns481:0crwdne481:0', + 'visibility' => 'crwdns482:0crwdne482:0', + 'public' => 'crwdns483:0crwdne483:0', + 'logged_in_only' => 'crwdns484:0crwdne484:0', + 'templates' => [ 'name' => 'crwdns389:0crwdne389:0', 'template' => 'crwdns390:0crwdne390:0', ], @@ -72,6 +76,9 @@ return [ 'description-help' => 'crwdns468:0crwdne468:0', 'display-chart' => 'crwdns469:0crwdne469:0', 'default-value' => 'crwdns470:0crwdne470:0', + 'calc_type' => 'crwdns475:0crwdne475:0', + 'type_sum' => 'crwdns476:0crwdne476:0', + 'type_avg' => 'crwdns477:0crwdne477:0', 'points' => [ 'value' => 'crwdns471:0crwdne471:0', @@ -82,17 +89,19 @@ return [ 'settings' => [ /// Application setup 'app-setup' => [ - 'site-name' => 'crwdns233:0crwdne233:0', - 'site-url' => 'crwdns398:0crwdne398:0', - 'site-timezone' => 'crwdns399:0crwdne399:0', - 'site-locale' => 'crwdns400:0crwdne400:0', - 'date-format' => 'crwdns401:0crwdne401:0', - 'display-graphs' => 'crwdns472:0crwdne472:0', - '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', + 'site-name' => 'crwdns233:0crwdne233:0', + 'site-url' => 'crwdns398:0crwdne398:0', + 'site-timezone' => 'crwdns399:0crwdne399:0', + 'site-locale' => 'crwdns400:0crwdne400:0', + 'date-format' => 'crwdns401:0crwdne401:0', + 'incident-date-format' => 'crwdns485:0crwdne485:0', + 'display-graphs' => 'crwdns472:0crwdne472:0', + 'about-this-page' => 'crwdns402:0crwdne402:0', + 'days-of-incidents' => 'crwdns403:0crwdne403:0', + 'banner' => 'crwdns404:0crwdne404:0', + 'banner-help' => "crwdns405:0crwdne405:0", + 'analytics_google' => 'crwdns486:0crwdne486:0', + 'analytics_gosquared' => 'crwdns487:0crwdne487:0', ], 'security' => [ 'allowed-domains' => 'crwdns407:0crwdne407:0', diff --git a/resources/lang/en-UD/pagination.php b/resources/lang/en-UD/pagination.php index fb0ae8dd..2e03bc2a 100755 --- a/resources/lang/en-UD/pagination.php +++ b/resources/lang/en-UD/pagination.php @@ -1,16 +1,5 @@ - * (c) Joseph Cohen - * (c) Graham Campbell - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - return [ /* diff --git a/resources/lang/en-UD/reminders.php b/resources/lang/en-UD/reminders.php index 7d1ffd31..7b1ed3cc 100755 --- a/resources/lang/en-UD/reminders.php +++ b/resources/lang/en-UD/reminders.php @@ -1,16 +1,5 @@ - * (c) Joseph Cohen - * (c) Graham Campbell - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - return [ /* diff --git a/resources/lang/en-UD/setup.php b/resources/lang/en-UD/setup.php index 9d5c4aae..d386812c 100755 --- a/resources/lang/en-UD/setup.php +++ b/resources/lang/en-UD/setup.php @@ -16,7 +16,7 @@ return [ 'title' => 'crwdns259:0crwdne259:0', 'service_details' => 'crwdns260:0crwdne260:0', 'status_page_setup' => 'crwdns261:0crwdne261:0', - 'show_support' => 'crwdns262:0crwdne262:0', + 'show_support' => 'crwdns488:0crwdne488:0', 'admin_account' => 'crwdns263:0crwdne263:0', 'complete_setup' => 'crwdns264:0crwdne264:0', 'completed' => 'crwdns291:0crwdne291:0', diff --git a/resources/lang/en-UD/validation.php b/resources/lang/en-UD/validation.php index 9c1cd283..ed198078 100755 --- a/resources/lang/en-UD/validation.php +++ b/resources/lang/en-UD/validation.php @@ -1,16 +1,5 @@ - * (c) Joseph Cohen - * (c) Graham Campbell - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - return [ /* @@ -24,65 +13,65 @@ return [ | */ - 'accepted' => 'crwdns96:0crwdne96:0', - 'active_url' => 'crwdns97:0crwdne97:0', - 'after' => 'crwdns98:0crwdne98:0', - 'alpha' => 'crwdns99:0crwdne99:0', - 'alpha_dash' => 'crwdns100:0crwdne100:0', - 'alpha_num' => 'crwdns101:0crwdne101:0', - 'array' => 'crwdns102:0crwdne102:0', - 'before' => 'crwdns103:0crwdne103:0', - 'between' => [ - 'numeric' => 'crwdns104:0crwdne104:0', - 'file' => 'crwdns418:0crwdne418:0', - 'string' => 'crwdns419:0crwdne419:0', - 'array' => 'crwdns420:0crwdne420:0', + "accepted" => "crwdns96:0crwdne96:0", + "active_url" => "crwdns97:0crwdne97:0", + "after" => "crwdns98:0crwdne98:0", + "alpha" => "crwdns99:0crwdne99:0", + "alpha_dash" => "crwdns100:0crwdne100:0", + "alpha_num" => "crwdns101:0crwdne101:0", + "array" => "crwdns102:0crwdne102:0", + "before" => "crwdns103:0crwdne103:0", + "between" => [ + "numeric" => "crwdns104:0crwdne104:0", + "file" => "crwdns418:0crwdne418:0", + "string" => "crwdns419:0crwdne419:0", + "array" => "crwdns420:0crwdne420:0", ], - 'boolean' => 'crwdns108:0crwdne108:0', - 'confirmed' => 'crwdns109:0crwdne109:0', - 'date' => 'crwdns110:0crwdne110:0', - 'date_format' => 'crwdns111:0crwdne111:0', - 'different' => 'crwdns112:0crwdne112:0', - 'digits' => 'crwdns113:0crwdne113:0', - 'digits_between' => 'crwdns114:0crwdne114:0', - 'email' => 'crwdns115:0crwdne115:0', - 'exists' => 'crwdns116:0crwdne116:0', - 'image' => 'crwdns117:0crwdne117:0', - 'in' => 'crwdns118:0crwdne118:0', - 'integer' => 'crwdns119:0crwdne119:0', - 'ip' => 'crwdns120:0crwdne120:0', - 'max' => [ - 'numeric' => 'crwdns121:0crwdne121:0', - 'file' => 'crwdns421:0crwdne421:0', - 'string' => 'crwdns422:0crwdne422:0', - 'array' => 'crwdns423:0crwdne423:0', + "boolean" => "crwdns108:0crwdne108:0", + "confirmed" => "crwdns109:0crwdne109:0", + "date" => "crwdns110:0crwdne110:0", + "date_format" => "crwdns111:0crwdne111:0", + "different" => "crwdns112:0crwdne112:0", + "digits" => "crwdns113:0crwdne113:0", + "digits_between" => "crwdns114:0crwdne114:0", + "email" => "crwdns115:0crwdne115:0", + "exists" => "crwdns116:0crwdne116:0", + "image" => "crwdns117:0crwdne117:0", + "in" => "crwdns118:0crwdne118:0", + "integer" => "crwdns119:0crwdne119:0", + "ip" => "crwdns120:0crwdne120:0", + "max" => [ + "numeric" => "crwdns121:0crwdne121:0", + "file" => "crwdns421:0crwdne421:0", + "string" => "crwdns422:0crwdne422:0", + "array" => "crwdns423:0crwdne423:0", ], - 'mimes' => 'crwdns125:0crwdne125:0', - 'min' => [ - 'numeric' => 'crwdns126:0crwdne126:0', - 'file' => 'crwdns424:0crwdne424:0', - 'string' => 'crwdns425:0crwdne425:0', - 'array' => 'crwdns426:0crwdne426:0', + "mimes" => "crwdns125:0crwdne125:0", + "min" => [ + "numeric" => "crwdns126:0crwdne126:0", + "file" => "crwdns424:0crwdne424:0", + "string" => "crwdns425:0crwdne425:0", + "array" => "crwdns426:0crwdne426:0", ], - 'not_in' => 'crwdns130:0crwdne130:0', - 'numeric' => 'crwdns131:0crwdne131:0', - 'regex' => 'crwdns132:0crwdne132:0', - 'required' => 'crwdns133:0crwdne133:0', - 'required_if' => 'crwdns134:0crwdne134:0', - 'required_with' => 'crwdns135:0crwdne135:0', - 'required_with_all' => 'crwdns136:0crwdne136:0', - 'required_without' => 'crwdns137:0crwdne137:0', - 'required_without_all' => 'crwdns138:0crwdne138:0', - 'same' => 'crwdns139:0crwdne139:0', - 'size' => [ - 'numeric' => 'crwdns140:0crwdne140:0', - 'file' => 'crwdns427:0crwdne427:0', - 'string' => 'crwdns428:0crwdne428:0', - 'array' => 'crwdns429:0crwdne429:0', + "not_in" => "crwdns130:0crwdne130:0", + "numeric" => "crwdns131:0crwdne131:0", + "regex" => "crwdns132:0crwdne132:0", + "required" => "crwdns133:0crwdne133:0", + "required_if" => "crwdns134:0crwdne134:0", + "required_with" => "crwdns135:0crwdne135:0", + "required_with_all" => "crwdns136:0crwdne136:0", + "required_without" => "crwdns137:0crwdne137:0", + "required_without_all" => "crwdns138:0crwdne138:0", + "same" => "crwdns139:0crwdne139:0", + "size" => [ + "numeric" => "crwdns140:0crwdne140:0", + "file" => "crwdns427:0crwdne427:0", + "string" => "crwdns428:0crwdne428:0", + "array" => "crwdns429:0crwdne429:0", ], - 'unique' => 'crwdns144:0crwdne144:0', - 'url' => 'crwdns145:0crwdne145:0', - 'timezone' => 'crwdns146:0crwdne146:0', + "unique" => "crwdns144:0crwdne144:0", + "url" => "crwdns145:0crwdne145:0", + "timezone" => "crwdns146:0crwdne146:0", /* |-------------------------------------------------------------------------- From b743d56901de81fabb68572338836759aafa38d0 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Fri, 22 May 2015 17:08:29 +0100 Subject: [PATCH 2/2] Fix lang src --- resources/lang/en-UD/forms.php | 2 +- resources/lang/en-UD/validation.php | 110 ++++++++++++++-------------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/resources/lang/en-UD/forms.php b/resources/lang/en-UD/forms.php index f137b8d0..bcae1fe1 100755 --- a/resources/lang/en-UD/forms.php +++ b/resources/lang/en-UD/forms.php @@ -99,7 +99,7 @@ return [ 'about-this-page' => 'crwdns402:0crwdne402:0', 'days-of-incidents' => 'crwdns403:0crwdne403:0', 'banner' => 'crwdns404:0crwdne404:0', - 'banner-help' => "crwdns405:0crwdne405:0", + 'banner-help' => 'crwdns405:0crwdne405:0', 'analytics_google' => 'crwdns486:0crwdne486:0', 'analytics_gosquared' => 'crwdns487:0crwdne487:0', ], diff --git a/resources/lang/en-UD/validation.php b/resources/lang/en-UD/validation.php index ed198078..685a82a7 100755 --- a/resources/lang/en-UD/validation.php +++ b/resources/lang/en-UD/validation.php @@ -13,65 +13,65 @@ return [ | */ - "accepted" => "crwdns96:0crwdne96:0", - "active_url" => "crwdns97:0crwdne97:0", - "after" => "crwdns98:0crwdne98:0", - "alpha" => "crwdns99:0crwdne99:0", - "alpha_dash" => "crwdns100:0crwdne100:0", - "alpha_num" => "crwdns101:0crwdne101:0", - "array" => "crwdns102:0crwdne102:0", - "before" => "crwdns103:0crwdne103:0", - "between" => [ - "numeric" => "crwdns104:0crwdne104:0", - "file" => "crwdns418:0crwdne418:0", - "string" => "crwdns419:0crwdne419:0", - "array" => "crwdns420:0crwdne420:0", + 'accepted' => 'crwdns96:0crwdne96:0', + 'active_url' => 'crwdns97:0crwdne97:0', + 'after' => 'crwdns98:0crwdne98:0', + 'alpha' => 'crwdns99:0crwdne99:0', + 'alpha_dash' => 'crwdns100:0crwdne100:0', + 'alpha_num' => 'crwdns101:0crwdne101:0', + 'array' => 'crwdns102:0crwdne102:0', + 'before' => 'crwdns103:0crwdne103:0', + 'between' => [ + 'numeric' => 'crwdns104:0crwdne104:0', + 'file' => 'crwdns418:0crwdne418:0', + 'string' => 'crwdns419:0crwdne419:0', + 'array' => 'crwdns420:0crwdne420:0', ], - "boolean" => "crwdns108:0crwdne108:0", - "confirmed" => "crwdns109:0crwdne109:0", - "date" => "crwdns110:0crwdne110:0", - "date_format" => "crwdns111:0crwdne111:0", - "different" => "crwdns112:0crwdne112:0", - "digits" => "crwdns113:0crwdne113:0", - "digits_between" => "crwdns114:0crwdne114:0", - "email" => "crwdns115:0crwdne115:0", - "exists" => "crwdns116:0crwdne116:0", - "image" => "crwdns117:0crwdne117:0", - "in" => "crwdns118:0crwdne118:0", - "integer" => "crwdns119:0crwdne119:0", - "ip" => "crwdns120:0crwdne120:0", - "max" => [ - "numeric" => "crwdns121:0crwdne121:0", - "file" => "crwdns421:0crwdne421:0", - "string" => "crwdns422:0crwdne422:0", - "array" => "crwdns423:0crwdne423:0", + 'boolean' => 'crwdns108:0crwdne108:0', + 'confirmed' => 'crwdns109:0crwdne109:0', + 'date' => 'crwdns110:0crwdne110:0', + 'date_format' => 'crwdns111:0crwdne111:0', + 'different' => 'crwdns112:0crwdne112:0', + 'digits' => 'crwdns113:0crwdne113:0', + 'digits_between' => 'crwdns114:0crwdne114:0', + 'email' => 'crwdns115:0crwdne115:0', + 'exists' => 'crwdns116:0crwdne116:0', + 'image' => 'crwdns117:0crwdne117:0', + 'in' => 'crwdns118:0crwdne118:0', + 'integer' => 'crwdns119:0crwdne119:0', + 'ip' => 'crwdns120:0crwdne120:0', + 'max' => [ + 'numeric' => 'crwdns121:0crwdne121:0', + 'file' => 'crwdns421:0crwdne421:0', + 'string' => 'crwdns422:0crwdne422:0', + 'array' => 'crwdns423:0crwdne423:0', ], - "mimes" => "crwdns125:0crwdne125:0", - "min" => [ - "numeric" => "crwdns126:0crwdne126:0", - "file" => "crwdns424:0crwdne424:0", - "string" => "crwdns425:0crwdne425:0", - "array" => "crwdns426:0crwdne426:0", + 'mimes' => 'crwdns125:0crwdne125:0', + 'min' => [ + 'numeric' => 'crwdns126:0crwdne126:0', + 'file' => 'crwdns424:0crwdne424:0', + 'string' => 'crwdns425:0crwdne425:0', + 'array' => 'crwdns426:0crwdne426:0', ], - "not_in" => "crwdns130:0crwdne130:0", - "numeric" => "crwdns131:0crwdne131:0", - "regex" => "crwdns132:0crwdne132:0", - "required" => "crwdns133:0crwdne133:0", - "required_if" => "crwdns134:0crwdne134:0", - "required_with" => "crwdns135:0crwdne135:0", - "required_with_all" => "crwdns136:0crwdne136:0", - "required_without" => "crwdns137:0crwdne137:0", - "required_without_all" => "crwdns138:0crwdne138:0", - "same" => "crwdns139:0crwdne139:0", - "size" => [ - "numeric" => "crwdns140:0crwdne140:0", - "file" => "crwdns427:0crwdne427:0", - "string" => "crwdns428:0crwdne428:0", - "array" => "crwdns429:0crwdne429:0", + 'not_in' => 'crwdns130:0crwdne130:0', + 'numeric' => 'crwdns131:0crwdne131:0', + 'regex' => 'crwdns132:0crwdne132:0', + 'required' => 'crwdns133:0crwdne133:0', + 'required_if' => 'crwdns134:0crwdne134:0', + 'required_with' => 'crwdns135:0crwdne135:0', + 'required_with_all' => 'crwdns136:0crwdne136:0', + 'required_without' => 'crwdns137:0crwdne137:0', + 'required_without_all' => 'crwdns138:0crwdne138:0', + 'same' => 'crwdns139:0crwdne139:0', + 'size' => [ + 'numeric' => 'crwdns140:0crwdne140:0', + 'file' => 'crwdns427:0crwdne427:0', + 'string' => 'crwdns428:0crwdne428:0', + 'array' => 'crwdns429:0crwdne429:0', ], - "unique" => "crwdns144:0crwdne144:0", - "url" => "crwdns145:0crwdne145:0", - "timezone" => "crwdns146:0crwdne146:0", + 'unique' => 'crwdns144:0crwdne144:0', + 'url' => 'crwdns145:0crwdne145:0', + 'timezone' => 'crwdns146:0crwdne146:0', /* |--------------------------------------------------------------------------