Merge remote-tracking branch 'upstream/develop' into feature/theming2
* upstream/develop: Fix color fallback order Use console.warn instead of console.log Get rid of mutation_types file, use inline approach. Minor fixes Add fallback color rule. Change english validation error messages Clean up the code Validate name presence on client-side as well Better styling for client-side validation. Add I18n for validation errors. Fix broken ToS link. Fix linter errors Add client validation for registration form Use Array.reduce instead of lodash.reduce Humanize validation errors returned on registration Added user option to hide instance-specific panel, rearranged config screen to better categorize it / adjustments to language selector fix
This commit is contained in:
commit
3452864260
14 changed files with 271 additions and 1056 deletions
|
@ -72,7 +72,15 @@
|
|||
"fullname": "Display name",
|
||||
"password_confirm": "Password confirmation",
|
||||
"registration": "Registration",
|
||||
"token": "Invite token"
|
||||
"token": "Invite token",
|
||||
"validations": {
|
||||
"username_required": "cannot be left blank",
|
||||
"fullname_required": "cannot be left blank",
|
||||
"email_required": "cannot be left blank",
|
||||
"password_required": "cannot be left blank",
|
||||
"password_confirmation_required": "cannot be left blank",
|
||||
"password_confirmation_match": "should be the same as password"
|
||||
}
|
||||
},
|
||||
"settings": {
|
||||
"attachmentRadius": "Attachments",
|
||||
|
@ -116,6 +124,7 @@
|
|||
"general": "General",
|
||||
"hide_attachments_in_convo": "Hide attachments in conversations",
|
||||
"hide_attachments_in_tl": "Hide attachments in timeline",
|
||||
"hide_isp": "Hide instance-specific panel",
|
||||
"hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
|
||||
"hide_user_stats": "Hide user statistics (e.g. the number of followers)",
|
||||
"import_followers_from_a_csv_file": "Import follows from a csv file",
|
||||
|
@ -124,6 +133,7 @@
|
|||
"checkboxRadius": "Checkboxes",
|
||||
"instance_default": "(default: {value})",
|
||||
"instance_default_simple" : "(default)",
|
||||
"interface": "Interface",
|
||||
"interfaceLanguage": "Interface language",
|
||||
"invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.",
|
||||
"limited_availability": "Unavailable in your browser",
|
||||
|
|
|
@ -55,7 +55,15 @@
|
|||
"fullname": "Отображаемое имя",
|
||||
"password_confirm": "Подтверждение пароля",
|
||||
"registration": "Регистрация",
|
||||
"token": "Код приглашения"
|
||||
"token": "Код приглашения",
|
||||
"validations": {
|
||||
"username_required": "не должно быть пустым",
|
||||
"fullname_required": "не должно быть пустым",
|
||||
"email_required": "не должен быть пустым",
|
||||
"password_required": "не должен быть пустым",
|
||||
"password_confirmation_required": "не должно быть пустым",
|
||||
"password_confirmation_match": "должно совпадать с паролем"
|
||||
}
|
||||
},
|
||||
"settings": {
|
||||
"attachmentRadius": "Прикреплённые файлы",
|
||||
|
@ -97,10 +105,12 @@
|
|||
"general": "Общие",
|
||||
"hide_attachments_in_convo": "Прятать вложения в разговорах",
|
||||
"hide_attachments_in_tl": "Прятать вложения в ленте",
|
||||
"hide_isp": "Скрыть серверную панель",
|
||||
"import_followers_from_a_csv_file": "Импортировать читаемых из файла .csv",
|
||||
"import_theme": "Загрузить Тему",
|
||||
"inputRadius": "Поля ввода",
|
||||
"checkboxRadius": "Чекбоксы",
|
||||
"interface": "Интерфейс",
|
||||
"interfaceLanguage": "Язык интерфейса",
|
||||
"limited_availability": "Не доступно в вашем браузере",
|
||||
"links": "Ссылки",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue