diff --git a/app/Console/Commands/Local/MonicaLocalize.php b/app/Console/Commands/Local/MonicaLocalize.php index 86d470442d7..3fa1bb66dfe 100644 --- a/app/Console/Commands/Local/MonicaLocalize.php +++ b/app/Console/Commands/Local/MonicaLocalize.php @@ -61,23 +61,7 @@ private function updateLocales(array $locales): void if ($this->option('update')) { $this->info('Updating locales...'); - - $aliases = config('lang-publisher.aliases'); - try { - foreach ($aliases as $locale => $alias) { - File::move(lang_path($alias.'.json'), lang_path($locale.'.json')); - File::moveDirectory(lang_path($alias), lang_path($locale), true); - } - - config(['lang-publisher.aliases' => []]); - - $this->call('lang:update'); - } finally { - foreach ($aliases as $locale => $alias) { - File::move(lang_path($locale.'.json'), lang_path($alias.'.json')); - File::moveDirectory(lang_path($locale), lang_path($alias), true); - } - } + $this->call('lang:update'); } $newLocales = collect($locales)->diff($currentLocales); diff --git a/config/lang-publisher.php b/config/lang-publisher.php deleted file mode 100644 index 7e3ee901641..00000000000 --- a/config/lang-publisher.php +++ /dev/null @@ -1,11 +0,0 @@ - [ - Locales::PORTUGUESE_BRAZIL->value => 'pt-BR', - Locales::CHINESE->value => 'zh-CN', - Locales::CHINESE_T->value => 'zh-TW', - ], -]; diff --git a/config/localizer.php b/config/localizer.php index 89deefe2ba5..82b581d03d0 100644 --- a/config/localizer.php +++ b/config/localizer.php @@ -8,7 +8,7 @@ */ 'supported_locales' => ['en', 'ar', 'bn', 'ca', 'da', 'de', 'es', 'el', 'fr', 'he', 'hi', 'it', 'ja', 'ml', 'nl', 'nn', 'pa', 'pl', 'pt', - 'pt-BR', 'ro', 'ru', 'sv', 'te', 'tr', 'ur', 'vi', 'zh-CN', 'zh-TW', + 'pt_BR', 'ro', 'ru', 'sv', 'te', 'tr', 'ur', 'vi', 'zh_CN', 'zh_TW', ], /** diff --git a/database/migrations/2023_10_06_064814_rename_locales.php b/database/migrations/2023_10_06_064814_rename_locales.php index 6d775352f30..ba90c776db8 100644 --- a/database/migrations/2023_10_06_064814_rename_locales.php +++ b/database/migrations/2023_10_06_064814_rename_locales.php @@ -11,6 +11,6 @@ public function up(): void { User::where('locale', 'no')->update(['locale' => 'nn']); - User::where('locale', 'zh')->update(['locale' => 'zh-CN']); + User::where('locale', 'zh')->update(['locale' => 'zh_CN']); } }; diff --git a/lang/ar.json b/lang/ar.json index 53e6c34930a..9b036a06342 100644 --- a/lang/ar.json +++ b/lang/ar.json @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 فظيعة", "😶‍🌫️ Neutral": "😶‍🌫️ محايد", "🥳 Awesome": "🥳رائع" -} +} \ No newline at end of file diff --git a/lang/bn.json b/lang/bn.json index 03122e84ebd..e02bf7a2dcc 100644 --- a/lang/bn.json +++ b/lang/bn.json @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 জঘন্য", "😶‍🌫️ Neutral": "😶‍🌫️ নিরপেক্ষ", "🥳 Awesome": "🥳 অসাধারণ" -} +} \ No newline at end of file diff --git a/lang/ca.json b/lang/ca.json index 6fa74e6695a..507b205e616 100644 --- a/lang/ca.json +++ b/lang/ca.json @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 Horrible", "😶‍🌫️ Neutral": "😶‍🌫️ Neutre", "🥳 Awesome": "🥳 Genial" -} +} \ No newline at end of file diff --git a/lang/da.json b/lang/da.json index 6f947dd6770..9334bc9ea6b 100644 --- a/lang/da.json +++ b/lang/da.json @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 Forfærdeligt", "😶‍🌫️ Neutral": "😶‍🌫️ Neutral", "🥳 Awesome": "🥳 Fantastisk" -} +} \ No newline at end of file diff --git a/lang/de.json b/lang/de.json index 36e442da5ba..ed05069f2ef 100644 --- a/lang/de.json +++ b/lang/de.json @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 Schrecklich", "😶‍🌫️ Neutral": "😶‍🌫️ Neutral", "🥳 Awesome": "🥳 Großartig" -} +} \ No newline at end of file diff --git a/lang/el.json b/lang/el.json index 3762ff92e80..72851b7086b 100644 --- a/lang/el.json +++ b/lang/el.json @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 Απαίσιο", "😶‍🌫️ Neutral": "😶‍🌫️ Ουδέτερο", "🥳 Awesome": "🥳 Υπέροχο" -} +} \ No newline at end of file diff --git a/lang/es.json b/lang/es.json index 842d59a5366..b8198066cdb 100644 --- a/lang/es.json +++ b/lang/es.json @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 Horrible", "😶‍🌫️ Neutral": "😶‍🌫️ Neutro", "🥳 Awesome": "🥳 Impresionante" -} +} \ No newline at end of file diff --git a/lang/he.json b/lang/he.json index 6273c2f6093..4c9c1ecd618 100644 --- a/lang/he.json +++ b/lang/he.json @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 נורא", "😶‍🌫️ Neutral": "😶‍🌫️ ניטרלי", "🥳 Awesome": "🥳 מדהים" -} +} \ No newline at end of file diff --git a/lang/hi.json b/lang/hi.json index 4f41f1d15ce..028ee87baf6 100644 --- a/lang/hi.json +++ b/lang/hi.json @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 भयानक", "😶‍🌫️ Neutral": "😶‍🌫️ तटस्थ", "🥳 Awesome": "🥳 बहुत बढ़िया" -} +} \ No newline at end of file diff --git a/lang/it.json b/lang/it.json index c09ee754500..6baf213cf20 100644 --- a/lang/it.json +++ b/lang/it.json @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 Terribile", "😶‍🌫️ Neutral": "😶‍🌫️ Neutrale", "🥳 Awesome": "🥳 Fantastico" -} +} \ No newline at end of file diff --git a/lang/ml.json b/lang/ml.json index 6659e8817ea..63cab9cb176 100644 --- a/lang/ml.json +++ b/lang/ml.json @@ -1284,4 +1284,4 @@ "😩 Awful": "😩 ഭയങ്കരം", "😶‍🌫️ Neutral": "😶‍🌫️ ന്യൂട്രൽ", "🥳 Awesome": "🥳 ഗംഭീരം" -} +} \ No newline at end of file diff --git a/lang/ml/pagination.php b/lang/ml/pagination.php index dae41be82a0..95c4110fc0e 100644 --- a/lang/ml/pagination.php +++ b/lang/ml/pagination.php @@ -1,6 +1,6 @@ 'തുടരുക ❯', - 'previous' => 'പിന്തുണ ❮', + 'next' => 'തുടരുക ❯', + 'previous' => '❮ പിന്തുണ', ]; diff --git a/lang/ml/validation.php b/lang/ml/validation.php index bd96682d837..145d7f68c4c 100644 --- a/lang/ml/validation.php +++ b/lang/ml/validation.php @@ -1,7 +1,5 @@ 'The :attribute must be accepted.', 'accepted_if' => 'The :attribute must be accepted when :other is :value.', @@ -13,6 +11,79 @@ 'alpha_num' => 'The :attribute may only contain letters and numbers.', 'array' => 'The :attribute must be an array.', 'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.', + 'attributes' => [ + 'address' => 'address', + 'age' => 'age', + 'amount' => 'amount', + 'area' => 'area', + 'available' => 'available', + 'birthday' => 'birthday', + 'body' => 'body', + 'city' => 'city', + 'content' => 'content', + 'country' => 'country', + 'created_at' => 'created at', + 'creator' => 'creator', + 'current_password' => 'current password', + 'date' => 'date', + 'date_of_birth' => 'date of birth', + 'day' => 'day', + 'deleted_at' => 'deleted at', + 'description' => 'description', + 'district' => 'district', + 'duration' => 'duration', + 'email' => 'email', + 'excerpt' => 'excerpt', + 'filter' => 'filter', + 'first_name' => 'first name', + 'gender' => 'gender', + 'group' => 'group', + 'hour' => 'hour', + 'image' => 'image', + 'last_name' => 'last name', + 'lesson' => 'lesson', + 'line_address_1' => 'line address 1', + 'line_address_2' => 'line address 2', + 'message' => 'message', + 'middle_name' => 'middle name', + 'minute' => 'minute', + 'mobile' => 'mobile', + 'month' => 'month', + 'name' => 'name', + 'national_code' => 'national code', + 'number' => 'number', + 'password' => 'password', + 'password_confirmation' => 'password confirmation', + 'phone' => 'phone', + 'photo' => 'photo', + 'postal_code' => 'postal code', + 'price' => 'price', + 'province' => 'province', + 'recaptcha_response_field' => 'recaptcha response field', + 'remember' => 'remember', + 'restored_at' => 'restored at', + 'result_text_under_image' => 'result text under image', + 'role' => 'role', + 'second' => 'second', + 'sex' => 'sex', + 'short_text' => 'short text', + 'size' => 'size', + 'state' => 'state', + 'street' => 'street', + 'student' => 'student', + 'subject' => 'subject', + 'teacher' => 'teacher', + 'terms' => 'terms', + 'test_description' => 'test description', + 'test_locale' => 'test locale', + 'test_name' => 'test name', + 'text' => 'text', + 'time' => 'time', + 'title' => 'title', + 'updated_at' => 'updated at', + 'username' => 'username', + 'year' => 'year', + ], 'before' => 'The :attribute must be a date before :date.', 'before_or_equal' => 'The :attribute must be a date before or equal to :date.', 'between' => [ @@ -58,8 +129,8 @@ ], 'image' => 'The :attribute must be an image.', 'in' => 'The selected :attribute is invalid.', - 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'The :attribute must be an integer.', + 'in_array' => 'The :attribute field does not exist in :other.', 'ip' => 'The :attribute must be a valid IP address.', 'ipv4' => 'The :attribute must be a valid IPv4 address.', 'ipv6' => 'The :attribute must be a valid IPv6 address.', @@ -122,9 +193,9 @@ 'required_if_accepted' => 'The :attribute field is required when :other is accepted.', 'required_unless' => 'The :attribute field is required unless :other is in :values.', 'required_with' => 'The :attribute field is required when :values is present.', - 'required_with_all' => 'The :attribute field is required when :values is present.', 'required_without' => 'The :attribute field is required when :values is not present.', 'required_without_all' => 'The :attribute field is required when none of :values are present.', + 'required_with_all' => 'The :attribute field is required when :values is present.', 'same' => 'The :attribute and :other must match.', 'size' => [ 'array' => 'The :attribute must contain :size items.', @@ -141,77 +212,4 @@ 'uppercase' => 'The :attribute field must be uppercase.', 'url' => 'The :attribute format is invalid.', 'uuid' => 'The :attribute must be a valid UUID.', - 'attributes' => [ - 'address' => 'address', - 'age' => 'age', - 'amount' => 'amount', - 'area' => 'area', - 'available' => 'available', - 'birthday' => 'birthday', - 'body' => 'body', - 'city' => 'city', - 'content' => 'content', - 'country' => 'country', - 'created_at' => 'created at', - 'creator' => 'creator', - 'current_password' => 'current password', - 'date' => 'date', - 'date_of_birth' => 'date of birth', - 'day' => 'day', - 'deleted_at' => 'deleted at', - 'description' => 'description', - 'district' => 'district', - 'duration' => 'duration', - 'email' => 'email', - 'excerpt' => 'excerpt', - 'filter' => 'filter', - 'first_name' => 'first name', - 'gender' => 'gender', - 'group' => 'group', - 'hour' => 'hour', - 'image' => 'image', - 'last_name' => 'last name', - 'lesson' => 'lesson', - 'line_address_1' => 'line address 1', - 'line_address_2' => 'line address 2', - 'message' => 'message', - 'middle_name' => 'middle name', - 'minute' => 'minute', - 'mobile' => 'mobile', - 'month' => 'month', - 'name' => 'name', - 'national_code' => 'national code', - 'number' => 'number', - 'password' => 'password', - 'password_confirmation' => 'password confirmation', - 'phone' => 'phone', - 'photo' => 'photo', - 'postal_code' => 'postal code', - 'price' => 'price', - 'province' => 'province', - 'recaptcha_response_field' => 'recaptcha response field', - 'remember' => 'remember', - 'restored_at' => 'restored at', - 'result_text_under_image' => 'result text under image', - 'role' => 'role', - 'second' => 'second', - 'sex' => 'sex', - 'short_text' => 'short text', - 'size' => 'size', - 'state' => 'state', - 'street' => 'street', - 'student' => 'student', - 'subject' => 'subject', - 'teacher' => 'teacher', - 'terms' => 'terms', - 'test_description' => 'test description', - 'test_locale' => 'test locale', - 'test_name' => 'test name', - 'text' => 'text', - 'time' => 'time', - 'title' => 'title', - 'updated_at' => 'updated at', - 'username' => 'username', - 'year' => 'year', - ], ]; diff --git a/lang/nl.json b/lang/nl.json index 85430a5b7c7..28b17140fa8 100644 --- a/lang/nl.json +++ b/lang/nl.json @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 Verschrikkelijk", "😶‍🌫️ Neutral": "😶‍🌫️ Neutraal", "🥳 Awesome": "🥳 Geweldig" -} +} \ No newline at end of file diff --git a/lang/nn.json b/lang/nn.json index 0c5600de73f..db2558e891e 100644 --- a/lang/nn.json +++ b/lang/nn.json @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 Forferdelig", "😶‍🌫️ Neutral": "😶‍🌫️ Nøytral", "🥳 Awesome": "🥳 Fantastisk" -} +} \ No newline at end of file diff --git a/lang/pa/http-statuses.php b/lang/pa/http-statuses.php index f2488f41c74..e8aff11eaac 100644 --- a/lang/pa/http-statuses.php +++ b/lang/pa/http-statuses.php @@ -1,7 +1,5 @@ 'Unknown Error', '100' => 'Continue', diff --git a/lang/pa/passwords.php b/lang/pa/passwords.php index 1130b8d4ac6..f0cb5403001 100644 --- a/lang/pa/passwords.php +++ b/lang/pa/passwords.php @@ -1,7 +1,5 @@ 'Your password has been reset.', 'sent' => 'We have emailed your password reset link.', diff --git a/lang/pa/validation.php b/lang/pa/validation.php index bd96682d837..145d7f68c4c 100644 --- a/lang/pa/validation.php +++ b/lang/pa/validation.php @@ -1,7 +1,5 @@ 'The :attribute must be accepted.', 'accepted_if' => 'The :attribute must be accepted when :other is :value.', @@ -13,6 +11,79 @@ 'alpha_num' => 'The :attribute may only contain letters and numbers.', 'array' => 'The :attribute must be an array.', 'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.', + 'attributes' => [ + 'address' => 'address', + 'age' => 'age', + 'amount' => 'amount', + 'area' => 'area', + 'available' => 'available', + 'birthday' => 'birthday', + 'body' => 'body', + 'city' => 'city', + 'content' => 'content', + 'country' => 'country', + 'created_at' => 'created at', + 'creator' => 'creator', + 'current_password' => 'current password', + 'date' => 'date', + 'date_of_birth' => 'date of birth', + 'day' => 'day', + 'deleted_at' => 'deleted at', + 'description' => 'description', + 'district' => 'district', + 'duration' => 'duration', + 'email' => 'email', + 'excerpt' => 'excerpt', + 'filter' => 'filter', + 'first_name' => 'first name', + 'gender' => 'gender', + 'group' => 'group', + 'hour' => 'hour', + 'image' => 'image', + 'last_name' => 'last name', + 'lesson' => 'lesson', + 'line_address_1' => 'line address 1', + 'line_address_2' => 'line address 2', + 'message' => 'message', + 'middle_name' => 'middle name', + 'minute' => 'minute', + 'mobile' => 'mobile', + 'month' => 'month', + 'name' => 'name', + 'national_code' => 'national code', + 'number' => 'number', + 'password' => 'password', + 'password_confirmation' => 'password confirmation', + 'phone' => 'phone', + 'photo' => 'photo', + 'postal_code' => 'postal code', + 'price' => 'price', + 'province' => 'province', + 'recaptcha_response_field' => 'recaptcha response field', + 'remember' => 'remember', + 'restored_at' => 'restored at', + 'result_text_under_image' => 'result text under image', + 'role' => 'role', + 'second' => 'second', + 'sex' => 'sex', + 'short_text' => 'short text', + 'size' => 'size', + 'state' => 'state', + 'street' => 'street', + 'student' => 'student', + 'subject' => 'subject', + 'teacher' => 'teacher', + 'terms' => 'terms', + 'test_description' => 'test description', + 'test_locale' => 'test locale', + 'test_name' => 'test name', + 'text' => 'text', + 'time' => 'time', + 'title' => 'title', + 'updated_at' => 'updated at', + 'username' => 'username', + 'year' => 'year', + ], 'before' => 'The :attribute must be a date before :date.', 'before_or_equal' => 'The :attribute must be a date before or equal to :date.', 'between' => [ @@ -58,8 +129,8 @@ ], 'image' => 'The :attribute must be an image.', 'in' => 'The selected :attribute is invalid.', - 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'The :attribute must be an integer.', + 'in_array' => 'The :attribute field does not exist in :other.', 'ip' => 'The :attribute must be a valid IP address.', 'ipv4' => 'The :attribute must be a valid IPv4 address.', 'ipv6' => 'The :attribute must be a valid IPv6 address.', @@ -122,9 +193,9 @@ 'required_if_accepted' => 'The :attribute field is required when :other is accepted.', 'required_unless' => 'The :attribute field is required unless :other is in :values.', 'required_with' => 'The :attribute field is required when :values is present.', - 'required_with_all' => 'The :attribute field is required when :values is present.', 'required_without' => 'The :attribute field is required when :values is not present.', 'required_without_all' => 'The :attribute field is required when none of :values are present.', + 'required_with_all' => 'The :attribute field is required when :values is present.', 'same' => 'The :attribute and :other must match.', 'size' => [ 'array' => 'The :attribute must contain :size items.', @@ -141,77 +212,4 @@ 'uppercase' => 'The :attribute field must be uppercase.', 'url' => 'The :attribute format is invalid.', 'uuid' => 'The :attribute must be a valid UUID.', - 'attributes' => [ - 'address' => 'address', - 'age' => 'age', - 'amount' => 'amount', - 'area' => 'area', - 'available' => 'available', - 'birthday' => 'birthday', - 'body' => 'body', - 'city' => 'city', - 'content' => 'content', - 'country' => 'country', - 'created_at' => 'created at', - 'creator' => 'creator', - 'current_password' => 'current password', - 'date' => 'date', - 'date_of_birth' => 'date of birth', - 'day' => 'day', - 'deleted_at' => 'deleted at', - 'description' => 'description', - 'district' => 'district', - 'duration' => 'duration', - 'email' => 'email', - 'excerpt' => 'excerpt', - 'filter' => 'filter', - 'first_name' => 'first name', - 'gender' => 'gender', - 'group' => 'group', - 'hour' => 'hour', - 'image' => 'image', - 'last_name' => 'last name', - 'lesson' => 'lesson', - 'line_address_1' => 'line address 1', - 'line_address_2' => 'line address 2', - 'message' => 'message', - 'middle_name' => 'middle name', - 'minute' => 'minute', - 'mobile' => 'mobile', - 'month' => 'month', - 'name' => 'name', - 'national_code' => 'national code', - 'number' => 'number', - 'password' => 'password', - 'password_confirmation' => 'password confirmation', - 'phone' => 'phone', - 'photo' => 'photo', - 'postal_code' => 'postal code', - 'price' => 'price', - 'province' => 'province', - 'recaptcha_response_field' => 'recaptcha response field', - 'remember' => 'remember', - 'restored_at' => 'restored at', - 'result_text_under_image' => 'result text under image', - 'role' => 'role', - 'second' => 'second', - 'sex' => 'sex', - 'short_text' => 'short text', - 'size' => 'size', - 'state' => 'state', - 'street' => 'street', - 'student' => 'student', - 'subject' => 'subject', - 'teacher' => 'teacher', - 'terms' => 'terms', - 'test_description' => 'test description', - 'test_locale' => 'test locale', - 'test_name' => 'test name', - 'text' => 'text', - 'time' => 'time', - 'title' => 'title', - 'updated_at' => 'updated at', - 'username' => 'username', - 'year' => 'year', - ], ]; diff --git a/lang/pl.json b/lang/pl.json index 694bdec5b37..b40aabe250d 100644 --- a/lang/pl.json +++ b/lang/pl.json @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 Straszne", "😶‍🌫️ Neutral": "😶‍🌫️ Neutralny", "🥳 Awesome": "🥳 Świetne" -} +} \ No newline at end of file diff --git a/lang/pt.json b/lang/pt.json index 09e6417769a..232cdbe012b 100644 --- a/lang/pt.json +++ b/lang/pt.json @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 Horrível", "😶‍🌫️ Neutral": "😶‍🌫️ Neutro", "🥳 Awesome": "🥳 Incrível" -} +} \ No newline at end of file diff --git a/lang/pt-BR.json b/lang/pt_BR.json similarity index 99% rename from lang/pt-BR.json rename to lang/pt_BR.json index df33794a2d1..695b1067673 100644 --- a/lang/pt-BR.json +++ b/lang/pt_BR.json @@ -24,12 +24,12 @@ "+ prefix": "+ prefixo", "+ pronoun": "+ pronome", "+ suffix": "+ sufixo", - ":count contact|:count contacts": ":count contato", - ":count hour slept|:count hours slept": ":count hora dormi", + ":count contact|:count contacts": ":count contato|:count contatos", + ":count hour slept|:count hours slept": ":count hora dormi|:count horas dormidas", ":count min read": ":count minutos de leitura", - ":count post|:count posts": ":count postagem", - ":count template section|:count template sections": ":count seção de modelo", - ":count word|:count words": ":count palavra", + ":count post|:count posts": ":count postagem|:count postagens", + ":count template section|:count template sections": ":count seção de modelo|:count seções de modelo", + ":count word|:count words": ":count palavra|:count palavras", ":distance km": ":distance km", ":distance miles": ":distance milhas", ":file at line :line": ":file na linha :line", @@ -763,7 +763,7 @@ "Rabbit": "Coelho", "Ran": "Corrido", "Rat": "Rato", - "Read :count time|Read :count times": "Leia :count vez", + "Read :count time|Read :count times": "Leia :count vez|Leia :count vezes", "Record a loan": "Registrar um empréstimo", "Record your mood": "Grave seu humor", "Recovery Code": "Código de Recuperação", @@ -853,7 +853,7 @@ "Sign in to your account": "Faça login em sua conta", "Sign up for an account": "Inscreva-se pra uma conta", "Sikh": "Sikh", - "Slept :count hour|Slept :count hours": "Dormi :count hora", + "Slept :count hour|Slept :count hours": "Dormi :count hora|Dormi :count horas", "Slice of life": "Fatia de vida", "Slices of life": "Fatias de vida", "Small animal": "Animal pequeno", @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 Horrível", "😶‍🌫️ Neutral": "😶‍🌫️ Neutro", "🥳 Awesome": "🥳 Incrível" -} +} \ No newline at end of file diff --git a/lang/pt-BR/auth.php b/lang/pt_BR/auth.php similarity index 100% rename from lang/pt-BR/auth.php rename to lang/pt_BR/auth.php diff --git a/lang/pt-BR/format.php b/lang/pt_BR/format.php similarity index 100% rename from lang/pt-BR/format.php rename to lang/pt_BR/format.php diff --git a/lang/pt-BR/http-statuses.php b/lang/pt_BR/http-statuses.php similarity index 100% rename from lang/pt-BR/http-statuses.php rename to lang/pt_BR/http-statuses.php diff --git a/lang/pt-BR/pagination.php b/lang/pt_BR/pagination.php similarity index 100% rename from lang/pt-BR/pagination.php rename to lang/pt_BR/pagination.php diff --git a/lang/pt-BR/passwords.php b/lang/pt_BR/passwords.php similarity index 100% rename from lang/pt-BR/passwords.php rename to lang/pt_BR/passwords.php diff --git a/lang/pt-BR/validation.php b/lang/pt_BR/validation.php similarity index 100% rename from lang/pt-BR/validation.php rename to lang/pt_BR/validation.php diff --git a/lang/ro.json b/lang/ro.json index c122d13d474..69fe0749822 100644 --- a/lang/ro.json +++ b/lang/ro.json @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 Îngrozitor", "😶‍🌫️ Neutral": "😶‍🌫️ Neutru", "🥳 Awesome": "🥳 Minunat" -} +} \ No newline at end of file diff --git a/lang/ru.json b/lang/ru.json index 8119d9a672f..0b4da282326 100644 --- a/lang/ru.json +++ b/lang/ru.json @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 Ужасно", "😶‍🌫️ Neutral": "😶‍🌫️ Нейтрально", "🥳 Awesome": "🥳 Круто" -} +} \ No newline at end of file diff --git a/lang/sv.json b/lang/sv.json index c29528e4397..74450cd8778 100644 --- a/lang/sv.json +++ b/lang/sv.json @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 Hemskt", "😶‍🌫️ Neutral": "😶‍🌫️ Neutral", "🥳 Awesome": "🥳 Fantastiskt" -} +} \ No newline at end of file diff --git a/lang/te.json b/lang/te.json index f9221450df3..f60af50a990 100644 --- a/lang/te.json +++ b/lang/te.json @@ -1284,4 +1284,4 @@ "😩 Awful": "😩 భయంకరం", "😶‍🌫️ Neutral": "😶‍🌫️ తటస్థ", "🥳 Awesome": "🥳 అద్భుతం" -} +} \ No newline at end of file diff --git a/lang/te/http-statuses.php b/lang/te/http-statuses.php index f2488f41c74..e8aff11eaac 100644 --- a/lang/te/http-statuses.php +++ b/lang/te/http-statuses.php @@ -1,7 +1,5 @@ 'Unknown Error', '100' => 'Continue', diff --git a/lang/te/passwords.php b/lang/te/passwords.php index 1130b8d4ac6..f0cb5403001 100644 --- a/lang/te/passwords.php +++ b/lang/te/passwords.php @@ -1,7 +1,5 @@ 'Your password has been reset.', 'sent' => 'We have emailed your password reset link.', diff --git a/lang/te/validation.php b/lang/te/validation.php index bd96682d837..145d7f68c4c 100644 --- a/lang/te/validation.php +++ b/lang/te/validation.php @@ -1,7 +1,5 @@ 'The :attribute must be accepted.', 'accepted_if' => 'The :attribute must be accepted when :other is :value.', @@ -13,6 +11,79 @@ 'alpha_num' => 'The :attribute may only contain letters and numbers.', 'array' => 'The :attribute must be an array.', 'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.', + 'attributes' => [ + 'address' => 'address', + 'age' => 'age', + 'amount' => 'amount', + 'area' => 'area', + 'available' => 'available', + 'birthday' => 'birthday', + 'body' => 'body', + 'city' => 'city', + 'content' => 'content', + 'country' => 'country', + 'created_at' => 'created at', + 'creator' => 'creator', + 'current_password' => 'current password', + 'date' => 'date', + 'date_of_birth' => 'date of birth', + 'day' => 'day', + 'deleted_at' => 'deleted at', + 'description' => 'description', + 'district' => 'district', + 'duration' => 'duration', + 'email' => 'email', + 'excerpt' => 'excerpt', + 'filter' => 'filter', + 'first_name' => 'first name', + 'gender' => 'gender', + 'group' => 'group', + 'hour' => 'hour', + 'image' => 'image', + 'last_name' => 'last name', + 'lesson' => 'lesson', + 'line_address_1' => 'line address 1', + 'line_address_2' => 'line address 2', + 'message' => 'message', + 'middle_name' => 'middle name', + 'minute' => 'minute', + 'mobile' => 'mobile', + 'month' => 'month', + 'name' => 'name', + 'national_code' => 'national code', + 'number' => 'number', + 'password' => 'password', + 'password_confirmation' => 'password confirmation', + 'phone' => 'phone', + 'photo' => 'photo', + 'postal_code' => 'postal code', + 'price' => 'price', + 'province' => 'province', + 'recaptcha_response_field' => 'recaptcha response field', + 'remember' => 'remember', + 'restored_at' => 'restored at', + 'result_text_under_image' => 'result text under image', + 'role' => 'role', + 'second' => 'second', + 'sex' => 'sex', + 'short_text' => 'short text', + 'size' => 'size', + 'state' => 'state', + 'street' => 'street', + 'student' => 'student', + 'subject' => 'subject', + 'teacher' => 'teacher', + 'terms' => 'terms', + 'test_description' => 'test description', + 'test_locale' => 'test locale', + 'test_name' => 'test name', + 'text' => 'text', + 'time' => 'time', + 'title' => 'title', + 'updated_at' => 'updated at', + 'username' => 'username', + 'year' => 'year', + ], 'before' => 'The :attribute must be a date before :date.', 'before_or_equal' => 'The :attribute must be a date before or equal to :date.', 'between' => [ @@ -58,8 +129,8 @@ ], 'image' => 'The :attribute must be an image.', 'in' => 'The selected :attribute is invalid.', - 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'The :attribute must be an integer.', + 'in_array' => 'The :attribute field does not exist in :other.', 'ip' => 'The :attribute must be a valid IP address.', 'ipv4' => 'The :attribute must be a valid IPv4 address.', 'ipv6' => 'The :attribute must be a valid IPv6 address.', @@ -122,9 +193,9 @@ 'required_if_accepted' => 'The :attribute field is required when :other is accepted.', 'required_unless' => 'The :attribute field is required unless :other is in :values.', 'required_with' => 'The :attribute field is required when :values is present.', - 'required_with_all' => 'The :attribute field is required when :values is present.', 'required_without' => 'The :attribute field is required when :values is not present.', 'required_without_all' => 'The :attribute field is required when none of :values are present.', + 'required_with_all' => 'The :attribute field is required when :values is present.', 'same' => 'The :attribute and :other must match.', 'size' => [ 'array' => 'The :attribute must contain :size items.', @@ -141,77 +212,4 @@ 'uppercase' => 'The :attribute field must be uppercase.', 'url' => 'The :attribute format is invalid.', 'uuid' => 'The :attribute must be a valid UUID.', - 'attributes' => [ - 'address' => 'address', - 'age' => 'age', - 'amount' => 'amount', - 'area' => 'area', - 'available' => 'available', - 'birthday' => 'birthday', - 'body' => 'body', - 'city' => 'city', - 'content' => 'content', - 'country' => 'country', - 'created_at' => 'created at', - 'creator' => 'creator', - 'current_password' => 'current password', - 'date' => 'date', - 'date_of_birth' => 'date of birth', - 'day' => 'day', - 'deleted_at' => 'deleted at', - 'description' => 'description', - 'district' => 'district', - 'duration' => 'duration', - 'email' => 'email', - 'excerpt' => 'excerpt', - 'filter' => 'filter', - 'first_name' => 'first name', - 'gender' => 'gender', - 'group' => 'group', - 'hour' => 'hour', - 'image' => 'image', - 'last_name' => 'last name', - 'lesson' => 'lesson', - 'line_address_1' => 'line address 1', - 'line_address_2' => 'line address 2', - 'message' => 'message', - 'middle_name' => 'middle name', - 'minute' => 'minute', - 'mobile' => 'mobile', - 'month' => 'month', - 'name' => 'name', - 'national_code' => 'national code', - 'number' => 'number', - 'password' => 'password', - 'password_confirmation' => 'password confirmation', - 'phone' => 'phone', - 'photo' => 'photo', - 'postal_code' => 'postal code', - 'price' => 'price', - 'province' => 'province', - 'recaptcha_response_field' => 'recaptcha response field', - 'remember' => 'remember', - 'restored_at' => 'restored at', - 'result_text_under_image' => 'result text under image', - 'role' => 'role', - 'second' => 'second', - 'sex' => 'sex', - 'short_text' => 'short text', - 'size' => 'size', - 'state' => 'state', - 'street' => 'street', - 'student' => 'student', - 'subject' => 'subject', - 'teacher' => 'teacher', - 'terms' => 'terms', - 'test_description' => 'test description', - 'test_locale' => 'test locale', - 'test_name' => 'test name', - 'text' => 'text', - 'time' => 'time', - 'title' => 'title', - 'updated_at' => 'updated at', - 'username' => 'username', - 'year' => 'year', - ], ]; diff --git a/lang/tr.json b/lang/tr.json index 8e2c2f8c308..5a0da152290 100644 --- a/lang/tr.json +++ b/lang/tr.json @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 Berbat", "😶‍🌫️ Neutral": "😶‍🌫️ Nötr", "🥳 Awesome": "🥳 Harika" -} +} \ No newline at end of file diff --git a/lang/ur.json b/lang/ur.json index d4939709e8c..82f3e5b1675 100644 --- a/lang/ur.json +++ b/lang/ur.json @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 خوفناک", "😶‍🌫️ Neutral": "😶‍🌫️ غیر جانبدار", "🥳 Awesome": "🥳 بہت اچھا" -} +} \ No newline at end of file diff --git a/lang/vi.json b/lang/vi.json index 48bf20075db..a2f5291474d 100644 --- a/lang/vi.json +++ b/lang/vi.json @@ -1283,4 +1283,4 @@ "😩 Awful": "😩 Kinh khủng", "😶‍🌫️ Neutral": "😶‍🌫️ Trung tính", "🥳 Awesome": "🥳 Tuyệt vời" -} +} \ No newline at end of file diff --git a/lang/zh-CN.json b/lang/zh_CN.json similarity index 100% rename from lang/zh-CN.json rename to lang/zh_CN.json diff --git a/lang/zh-CN/auth.php b/lang/zh_CN/auth.php similarity index 100% rename from lang/zh-CN/auth.php rename to lang/zh_CN/auth.php diff --git a/lang/zh-CN/format.php b/lang/zh_CN/format.php similarity index 100% rename from lang/zh-CN/format.php rename to lang/zh_CN/format.php diff --git a/lang/zh-CN/http-statuses.php b/lang/zh_CN/http-statuses.php similarity index 100% rename from lang/zh-CN/http-statuses.php rename to lang/zh_CN/http-statuses.php diff --git a/lang/zh-CN/pagination.php b/lang/zh_CN/pagination.php similarity index 100% rename from lang/zh-CN/pagination.php rename to lang/zh_CN/pagination.php diff --git a/lang/zh-CN/passwords.php b/lang/zh_CN/passwords.php similarity index 100% rename from lang/zh-CN/passwords.php rename to lang/zh_CN/passwords.php diff --git a/lang/zh-CN/validation.php b/lang/zh_CN/validation.php similarity index 100% rename from lang/zh-CN/validation.php rename to lang/zh_CN/validation.php diff --git a/lang/zh-TW.json b/lang/zh_TW.json similarity index 100% rename from lang/zh-TW.json rename to lang/zh_TW.json diff --git a/lang/zh-TW/auth.php b/lang/zh_TW/auth.php similarity index 100% rename from lang/zh-TW/auth.php rename to lang/zh_TW/auth.php diff --git a/lang/zh-TW/format.php b/lang/zh_TW/format.php similarity index 100% rename from lang/zh-TW/format.php rename to lang/zh_TW/format.php diff --git a/lang/zh-TW/http-statuses.php b/lang/zh_TW/http-statuses.php similarity index 100% rename from lang/zh-TW/http-statuses.php rename to lang/zh_TW/http-statuses.php diff --git a/lang/zh-TW/pagination.php b/lang/zh_TW/pagination.php similarity index 100% rename from lang/zh-TW/pagination.php rename to lang/zh_TW/pagination.php diff --git a/lang/zh-TW/passwords.php b/lang/zh_TW/passwords.php similarity index 100% rename from lang/zh-TW/passwords.php rename to lang/zh_TW/passwords.php diff --git a/lang/zh-TW/validation.php b/lang/zh_TW/validation.php similarity index 100% rename from lang/zh-TW/validation.php rename to lang/zh_TW/validation.php