From 34090a85e4a8db1b28416cb8a5c0703cab271cfd Mon Sep 17 00:00:00 2001 From: Alix Rossi Date: Fri, 29 Mar 2019 14:06:16 +0100 Subject: Update Corsican translations (#10418) * Update Corsican translation * Update Corsican YML * Corsican JSON fix * Update co.yml --- config/locales/activerecord.co.yml | 5 +++-- config/locales/co.yml | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/locales/activerecord.co.yml b/config/locales/activerecord.co.yml index 20c35b67f..0a9a936dd 100644 --- a/config/locales/activerecord.co.yml +++ b/config/locales/activerecord.co.yml @@ -2,8 +2,9 @@ co: activerecord: attributes: - status: - owned_poll: Scandagliu + poll: + expires_at: Fine + options: Scelte errors: models: account: diff --git a/config/locales/co.yml b/config/locales/co.yml index 71882b7cb..90c60e292 100644 --- a/config/locales/co.yml +++ b/config/locales/co.yml @@ -245,6 +245,7 @@ co: feature_profile_directory: Annuariu di i prufili feature_registrations: Arregistramenti feature_relay: Ripetitore di federazione + feature_timeline_preview: Vista di a linea pubblica features: Funziunalità hidden_service: Federazione cù servizii piattati open_reports: signalamenti aperti @@ -586,6 +587,9 @@ co: content: Scusate, mà c’hè statu un prublemu cù u nostru servore. title: Sta pagina ùn hè curretta noscript_html: Mastodon nant’à u web hà bisognu di JavaScript per funziunà. Pudete ancu pruvà l’applicazione native per a vostra piattaforma. + existing_username_validator: + not_found: ùn si pudeva micca truvà un'utilizatore lucale cù stu cugnome + not_found_multiple: ùn si pudeva micca truvà %{usernames} exports: archive_takeout: date: Data @@ -629,10 +633,31 @@ co: all: Tuttu changes_saved_msg: Cambiamenti salvati! copy: Cupià + order_by: Urdinà per save_changes: Salvà e mudificazione validation_errors: one: Qualcosa ùn và bè! Verificate u prublemu quì sottu other: Qualcosa ùn và bè! Verificate %{count} prublemi quì sottu + html_validator: + invalid_markup: 'cuntene codice HTML invalidu: %{error}' + identity_proofs: + active: Attiva + authorize: Ié, auturizà + authorize_connection_prompt: Auturizà sta cunnessione crittograffica? + errors: + failed: A cunnessione crittograffica s'hè fiascata. Ripruvate da %{provider}. + keybase: + invalid_token: E fiscie Keybase sò hash di firme è duvenu fà 66 caratteri esadecimali (0-9 A-F) + verification_failed: Keybase ùn ricunosce micca sta fiscia cum'una firma di l'utilizatore Keybase %{kb_username}. Ripruvate da Keybase. + wrong_user: Ùn si pò micca creà una prova per %{proving} mentre chì site cunnettatu·a cum'è %{current}. Cunnettatevi cum'è %{proving} è ripruvate. + explanation_html: Quì pudete cunnettà crittografficamente e vostre altre identità, cum'è per esempiu un prufile Keybase. Quessu permette à d'altre persone di mandà vi missaghji crittati, è d'affiducià i cuntinuti chì mandate. + i_am_html: Sò %{username} nant'à %{service}. + identity: Identità + inactive: Inattiva + publicize_checkbox: 'È mandà stu statutu:' + publicize_toot: 'Hè pruvata! Sò %{username} nant’à %{service}: %{url}' + status: Statutu di a verificazione + view_proof: Vede a prova imports: modes: merge: Unisce @@ -753,6 +778,8 @@ co: relationships: activity: Attività di u contu dormant: Inattivu + last_active: Ultima attività + most_recent: Più ricente moved: Spiazzatu mutual: Mutuale primary: Primariu @@ -835,6 +862,7 @@ co: edit_profile: Mudificà u prufile export: Spurtazione d’infurmazione featured_tags: Hashtag in vista + identity_proofs: Prove d'identità import: Impurtazione migrate: Migrazione di u contu notifications: Nutificazione -- cgit From e5d79d1635a142367d8e7065f6a84e0c214c67a5 Mon Sep 17 00:00:00 2001 From: Jeong Arm Date: Fri, 29 Mar 2019 22:14:24 +0900 Subject: Add missing Korean translations (#10416) * Fix Korean translation * Add missing translation --- app/javascript/mastodon/locales/ko.json | 2 +- config/locales/ko.yml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index 568359651..433592ffd 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -83,7 +83,7 @@ "compose_form.spoiler.unmarked": "열람주의가 설정 되어 있지 않습니다", "compose_form.spoiler_placeholder": "경고", "confirmation_modal.cancel": "취소", - "confirmations.block.block_and_report": "Block & Report", + "confirmations.block.block_and_report": "차단하고 신고하기", "confirmations.block.confirm": "차단", "confirmations.block.message": "정말로 {name}를 차단하시겠습니까?", "confirmations.delete.confirm": "삭제", diff --git a/config/locales/ko.yml b/config/locales/ko.yml index ee5d662bb..fd1470d2d 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -245,6 +245,7 @@ ko: feature_profile_directory: 프로필 디렉토리 feature_registrations: 가입 feature_relay: 연합 릴레이 + feature_timeline_preview: 타임라인 미리보기 features: 기능 hidden_service: 히든 서비스와의 연합 open_reports: 미해결 신고 @@ -634,6 +635,7 @@ ko: all: 모두 changes_saved_msg: 정상적으로 변경되었습니다! copy: 복사 + order_by: 순서 save_changes: 변경 사항을 저장 validation_errors: one: 오류가 발생했습니다. 아래 오류를 확인해 주십시오 @@ -649,10 +651,13 @@ ko: keybase: invalid_token: 키베이스 토큰은 서명의 해시이며 66자의 16진수 문자여야 합니다 verification_failed: 키베이스가 이 토큰을 키베이스 유저 %{kb_username}의 서명으로 인식하지 못했습니다. 키베이스에서 다시 시도하세요. + wrong_user: "%{current}로 로그인 한 상태에서는 %{proving}에 대한 증명을 할 수 없습니다. %{proving}으로 로그인 한 후 다시 시도하세요." explanation_html: 키베이스와 같은 다른 명의에 대한 암호화 연결을 할 수 있습니다. 이것으로 다른 사람들이 당신에게 암호화 된 메시지를 보낼 수 있고 당신의 메시지를 믿을 수 있습니다. i_am_html: 나는 %{service}의 %{username} 입니다. identity: 신원 inactive: 비활성 + publicize_checkbox: '그리고 이것을 툿 하세요:' + publicize_toot: '증명되었습니다! 저는 %{service}에 있는 %{username}입니다: %{url}' status: 인증 상태 view_proof: 증명 보기 imports: @@ -775,6 +780,8 @@ ko: relationships: activity: 계정 활동 dormant: 휴면 + last_active: 마지막 활동 + most_recent: 가장 최근 moved: 이동함 mutual: 상호 팔로우 primary: 주 계정 -- cgit From 1d62b88f8d55aa063e6c6dc4c047f1cf74f6b5bc Mon Sep 17 00:00:00 2001 From: Aditoo17 <42938951+Aditoo17@users.noreply.github.com> Date: Fri, 29 Mar 2019 16:59:48 +0100 Subject: I18n: Update Czech translation (#10419) --- app/javascript/mastodon/locales/cs.json | 2 +- config/locales/cs.yml | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json index 9115f5081..e711961e7 100644 --- a/app/javascript/mastodon/locales/cs.json +++ b/app/javascript/mastodon/locales/cs.json @@ -26,7 +26,7 @@ "account.posts": "Tooty", "account.posts_with_replies": "Tooty a odpovědi", "account.report": "Nahlásit uživatele @{name}", - "account.requested": "Požadavek čeká na schválení. Kliknutím zrušíte požadavek o sledování", + "account.requested": "Čekám na schválení. Kliknutím zrušíte požadavek o sledování", "account.share": "Sdílet profil uživatele @{name}", "account.show_reblogs": "Zobrazit boosty od uživatele @{name}", "account.unblock": "Odblokovat uživatele @{name}", diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 2ec3f6790..43d8764ff 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -650,16 +650,19 @@ cs: identity_proofs: active: Aktivní authorize: Ano, autorizovat - authorize_connection_prompt: Autorizovat tohle kryptografické spojení? + authorize_connection_prompt: Autorizovat toto kryptografické spojení? errors: failed: Kryptografické spojení selhalo. Prosím zkuste to znovu z %{provider}. keybase: invalid_token: Tokeny Keybase jsou hashe podpisů a musí být 66 znaků dlouhé verification_failed: Keybase nerozpoznává tento token jako podpis uživatele %{kb_username} na Keybase. Prosím zkuste to znovu z Keybase. + wrong_user: Nelze vytvořit důkaz pro uživatele %{proving}, zatímco jste přihlášen/a jako %{current}. Přihlaste se jako %{proving} a zkuste to znovu. explanation_html: Zde můžete kryptograficky připojit vaše ostatní identity, například profil Keybase. To dovolí jiným lidem vám posílat šifrované zprávy a důvěřovat obsahu, který jim pošlete. i_am_html: Na %{service} jsem %{username}. identity: Identita inactive: Neaktivní + publicize_checkbox: 'A tootnout tohle:' + publicize_toot: 'Je to dokázáno! Na %{service} jsem %{username}: %{url}' status: Stav ověření view_proof: Zobrazit důkaz imports: @@ -784,6 +787,8 @@ cs: relationships: activity: Aktivita účtu dormant: Nečinné + last_active: Naposledy aktivní + most_recent: Nedávno přidaní moved: Přesunuté mutual: Vzájemné primary: Primární @@ -1026,7 +1031,7 @@ cs: recovery_codes_regenerated: Záložní kódy byly úspěšně znovu vygenerované recovery_instructions_html: Ztratíte-li někdy přístup k vašemu telefonu, můžete k získání přístupu k účtu použít jeden ze záložních kódů. Uchovávejte tyto kódy v bezpečí. Můžete si je například vytisknout a uložit je mezi jiné důležité dokumenty. setup: Nastavit - wrong_code: Zadaný kód byl neplatný! Je serverový čas a čas na zařízení správný? + wrong_code: Zadaný kód byl neplatný! Je čas na serveru a na zařízení správný? user_mailer: backup_ready: explanation: Vyžádal/a jste si úplnou zálohu svého účtu Mastodon. Nyní je připravena ke stažení! -- cgit From 8fb69f1366577483f048bf4d69f610087da99cb1 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 30 Mar 2019 01:41:35 +0100 Subject: Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413) Fix #10315 This reverts commit db06b25376ac7e844e86fb9890fa9f1c2edd2d60. --- .../compose/components/emoji_picker_dropdown.js | 51 +++++----------------- .../mastodon/features/emoji/emoji_picker.js | 4 +- app/javascript/styles/mastodon/components.scss | 4 +- app/javascript/styles/mastodon/emoji_picker.scss | 25 ++--------- config/webpack/rules/node_modules.js | 11 +---- package.json | 2 +- yarn.lock | 9 ++-- 7 files changed, 24 insertions(+), 82 deletions(-) (limited to 'config') diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js index 038d93483..c1429c756 100644 --- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js +++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js @@ -50,7 +50,6 @@ class ModifierPickerMenu extends React.PureComponent { active: PropTypes.bool, onSelect: PropTypes.func.isRequired, onClose: PropTypes.func.isRequired, - modifier: PropTypes.number, }; handleClick = e => { @@ -87,36 +86,20 @@ class ModifierPickerMenu extends React.PureComponent { setRef = c => { this.node = c; - if (this.node) { - this.node.querySelector('li:first-child button').focus(); // focus the first element when opened - } } render () { - const { active, modifier } = this.props; + const { active } = this.props; return ( -
    - {[1, 2, 3, 4, 5, 6].map(i => ( -
  • - -
    • - ))} -
+
+ + + + + + +
); } @@ -148,22 +131,10 @@ class ModifierPicker extends React.PureComponent { render () { const { active, modifier } = this.props; - function setRef(ref) { - if (!ref) { - return; - } - // TODO: It would be nice if we could pass props directly to emoji-mart's buttons. - const button = ref.querySelector('button'); - button.setAttribute('aria-haspopup', 'true'); - button.setAttribute('aria-expanded', active); - } - return (
-
- -
- + +
); } diff --git a/app/javascript/mastodon/features/emoji/emoji_picker.js b/app/javascript/mastodon/features/emoji/emoji_picker.js index 73fcaa8c8..044d38cb2 100644 --- a/app/javascript/mastodon/features/emoji/emoji_picker.js +++ b/app/javascript/mastodon/features/emoji/emoji_picker.js @@ -1,5 +1,5 @@ -import Picker from 'emoji-mart/dist-modern/components/picker/picker'; -import Emoji from 'emoji-mart/dist-modern/components/emoji/emoji'; +import Picker from 'emoji-mart/dist-es/components/picker/picker'; +import Emoji from 'emoji-mart/dist-es/components/emoji/emoji'; export { Picker, diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 3c17c2ee4..fdf5144ce 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -3226,11 +3226,11 @@ a.status-card.compact:hover { box-shadow: 1px 2px 6px rgba($base-shadow-color, 0.2); overflow: hidden; - li { + button { display: block; cursor: pointer; border: 0; - padding: 3px 8px; + padding: 4px 8px; background: transparent; &:hover, diff --git a/app/javascript/styles/mastodon/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss index d53f41a0b..e49084b5f 100644 --- a/app/javascript/styles/mastodon/emoji_picker.scss +++ b/app/javascript/styles/mastodon/emoji_picker.scss @@ -1,5 +1,3 @@ -@import '../../../node_modules/emoji-mart/css/emoji-mart.css'; - .emoji-mart { &, * { @@ -53,14 +51,6 @@ &:hover { color: darken($lighter-text-color, 4%); - - svg { - fill: darken($lighter-text-color, 4%); - } - } - - svg { - fill: $lighter-text-color; } } @@ -69,19 +59,11 @@ &:hover { color: darken($highlight-text-color, 4%); - - svg { - fill: darken($highlight-text-color, 4%); - } } .emoji-mart-anchor-bar { bottom: -1px; } - - svg { - fill: $highlight-text-color; - } } .emoji-mart-anchor-bar { @@ -101,6 +83,7 @@ } svg { + fill: currentColor; max-height: 18px; } } @@ -120,14 +103,15 @@ } .emoji-mart-search { - margin: 10px 40px 10px 5px; + padding: 10px; + padding-right: 45px; background: $simple-background-color; input { font-size: 14px; font-weight: 400; padding: 7px 9px; - font-family: $font-sans-serif; + font-family: inherit; display: block; width: 100%; background: rgba($ui-secondary-color, 0.3); @@ -182,7 +166,6 @@ font-weight: 500; padding: 5px 6px; background: $simple-background-color; - font-family: $font-sans-serif; } } diff --git a/config/webpack/rules/node_modules.js b/config/webpack/rules/node_modules.js index 5debc1b5d..7ed05504b 100644 --- a/config/webpack/rules/node_modules.js +++ b/config/webpack/rules/node_modules.js @@ -11,16 +11,7 @@ module.exports = { options: { babelrc: false, plugins: [ - [ - 'transform-react-remove-prop-types', - { - mode: 'remove', - removeImport: true, - additionalLibraries: [ - '../../utils/shared-props', // emoji-mart - ], - }, - ], + 'transform-react-remove-prop-types', ], cacheDirectory: join(settings.cache_path, 'babel-loader-node-modules'), cacheCompression: env.NODE_ENV === 'production', diff --git a/package.json b/package.json index b9d8f8af1..63cfa25b8 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "cssnano": "^4.1.10", "detect-passive-events": "^1.0.2", "dotenv": "^6.2.0", - "emoji-mart": "^2.10.0", + "emoji-mart": "Gargron/emoji-mart#build", "es6-symbol": "^3.1.1", "escape-html": "^1.0.3", "exif-js": "^2.3.0", diff --git a/yarn.lock b/yarn.lock index 9b0ec51db..9d7f0eccb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3173,12 +3173,9 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" -emoji-mart@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-2.10.0.tgz#e1adec430f4963f79055b12b80e6d60c5abb742d" - integrity sha512-VhcX463f8TDaQc1Tpc8rI31E15+8KXOYff1vwjokjMT52bZlCQCyq3zrnNScSYjv95f1+R4DMMreeuPvYFvOhg== - dependencies: - prop-types "^15.6.0" +emoji-mart@Gargron/emoji-mart#build: + version "2.6.2" + resolved "https://codeload.github.com/Gargron/emoji-mart/tar.gz/ff00dc470b5b2d9f145a6d6e977a54de5df2b4c9" emoji-regex@^6.5.1: version "6.5.1" -- cgit