From c480da375b9f41d02d3a5b5a4b56281f60b82a49 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 30 Nov 2018 21:38:09 +0100 Subject: [PATCH 1/4] Bump version to 2.6.4 (#9402) --- CHANGELOG.md | 5 +++++ lib/mastodon/version.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47fa6a25d..d09dc452a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ Changelog All notable changes to this project will be documented in this file. +## [2.6.4] - 2018-11-30 +### Fixed + +- Fix yarn dependencies not installing due to yanked event-stream package (#9401) + ## [2.6.3] - 2018-11-30 ### Added diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 7157ae90e..9c2542ac7 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -13,7 +13,7 @@ module Mastodon end def patch - 3 + 4 end def pre From b9ec34de57c39f825deffd4cab6d84cde2dd7695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Ngei?= Date: Sat, 1 Dec 2018 14:25:15 +0100 Subject: [PATCH 2/4] Add a tooltip explaining what a locked account is (#9403) * create a title tooltip explaining what a locked account is * improve phrasing * minor phrasing fix to unify default and english --- app/javascript/mastodon/features/account/components/header.js | 3 ++- app/javascript/mastodon/locales/en.json | 1 + app/javascript/mastodon/locales/pl.json | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js index 11ae58905..8604e7167 100644 --- a/app/javascript/mastodon/features/account/components/header.js +++ b/app/javascript/mastodon/features/account/components/header.js @@ -16,6 +16,7 @@ const messages = defineMessages({ unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' }, edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' }, linkVerifiedOn: { id: 'account.link_verified_on', defaultMessage: 'Ownership of this link was checked on {date}' }, + account_locked: { id: 'account.locked_info', defaultMessage: 'This account privacy status is set to locked. The owner manually reviews who can follow them.' }, }); const dateFormatOptions = { @@ -148,7 +149,7 @@ class Header extends ImmutablePureComponent { } if (account.get('locked')) { - lockedIcon = ; + lockedIcon = ; } const content = { __html: account.get('note_emojified') }; diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index b39e321f2..9a15d84b7 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -17,6 +17,7 @@ "account.follows_you": "Follows you", "account.hide_reblogs": "Hide boosts from @{name}", "account.link_verified_on": "Ownership of this link was checked on {date}", + "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.", "account.media": "Media", "account.mention": "Mention @{name}", "account.moved_to": "{name} has moved to:", diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index 3679b8a2b..ae673cf9f 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -17,6 +17,7 @@ "account.follows_you": "Śledzi Cię", "account.hide_reblogs": "Ukryj podbicia od @{name}", "account.link_verified_on": "Własność tego odnośnika została potwierdzona {date}", + "account.locked_info": "To konto jest prywatne. Właściciel ręcznie wybiera kto może go śledzić.", "account.media": "Zawartość multimedialna", "account.mention": "Wspomnij o @{name}", "account.moved_to": "{name} przeniósł(-osła) się do:", From 6a285f0a15cfd3815c3ec2c725303745e5240c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quent=C3=AD?= <33203663+Quenty31@users.noreply.github.com> Date: Sat, 1 Dec 2018 17:39:13 +0100 Subject: [PATCH 3/4] [i18n] update and corrections for Occitan locale (#9404) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update + correction Colomna and not columna Pòt, verb missing * Correction D’aquí is followed by a time period, and dins by a season. Read : https://github.com/briannesbitt/Carbon/pull/1403 for more details. * Correction admin zone * Correction Reïnicializacion, with the funny ï --- .../mastodon/locales/locale-data/oc.js | 24 +++++++++--------- app/javascript/mastodon/locales/oc.json | 25 ++++++++++--------- config/locales/devise.oc.yml | 4 +-- config/locales/oc.yml | 14 +++++------ 4 files changed, 34 insertions(+), 33 deletions(-) diff --git a/app/javascript/mastodon/locales/locale-data/oc.js b/app/javascript/mastodon/locales/locale-data/oc.js index c4b56350b..d4adc42eb 100644 --- a/app/javascript/mastodon/locales/locale-data/oc.js +++ b/app/javascript/mastodon/locales/locale-data/oc.js @@ -17,8 +17,8 @@ export default [{ }, relativeTime: { future: { - one: "dins {0} an", - other: "dins {0} ans", + one: "d’aquí {0} an", + other: "d’aquí {0} ans", }, past: { one: "fa {0} an", @@ -35,8 +35,8 @@ export default [{ }, relativeTime: { future: { - one: "dins {0} mes", - other: "dins {0} meses", + one: "d’aquí {0} mes", + other: "d’aquí {0} meses", }, past: { one: "fa {0} mes", @@ -53,8 +53,8 @@ export default [{ }, relativeTime: { future: { - one: "dins {0} jorn", - other: "dins {0} jorns", + one: "d’aquí {0} jorn", + other: "d’aquí {0} jorns", }, past: { one: "fa {0} jorn", @@ -66,8 +66,8 @@ export default [{ displayName: "ora", relativeTime: { future: { - one: "dins {0} ora", - other: "dins {0} oras", + one: "d’aquí {0} ora", + other: "d’aquí {0} oras", }, past: { one: "fa {0} ora", @@ -79,8 +79,8 @@ export default [{ displayName: "minuta", relativeTime: { future: { - one: "dins {0} minuta", - other: "dins {0} minutas", + one: "d’aquí {0} minuta", + other: "d’aquí {0} minutas", }, past: { one: "fa {0} minuta", @@ -95,8 +95,8 @@ export default [{ }, relativeTime: { future: { - one: "dins {0} segonda", - other: "dins {0} segondas", + one: "d’aquí {0} segonda", + other: "d’aquí {0} segondas", }, past: { one: "fa {0} segonda", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index ec0507e15..a94e0336d 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -1,5 +1,5 @@ { - "account.add_or_remove_from_list": "Add or Remove from lists", + "account.add_or_remove_from_list": "Ajustar o tirar de las listas", "account.badges.bot": "Robòt", "account.block": "Blocar @{name}", "account.block_domain": "Tot amagar del domeni {domain}", @@ -17,6 +17,7 @@ "account.follows_you": "Vos sèc", "account.hide_reblogs": "Rescondre los partatges de @{name}", "account.link_verified_on": "La proprietat d’aqueste ligam foguèt verificada lo {date}", + "account.locked_info": "L’estatut de privacitat del compte es configurat sus clavat. Lo proprietari causís qual pòt sègre son compte.", "account.media": "Mèdias", "account.mention": "Mencionar @{name}", "account.moved_to": "{name} a mudat los catons a :", @@ -68,7 +69,7 @@ "community.column_settings.media_only": "Solament los mèdias", "compose_form.direct_message_warning": "Sols los mencionats poiràn veire aqueste tut.", "compose_form.direct_message_warning_learn_more": "Ne saber mai", - "compose_form.hashtag_warning": "Aqueste tut serà pas ligat a cap d’etiqueta estant qu’es pas listat. Òm pas cercar que los tuts publics per etiqueta.", + "compose_form.hashtag_warning": "Aqueste tut serà pas ligat a cap d’etiqueta estant qu’es pas listat. Òm pòt pas cercar que los tuts publics per etiqueta.", "compose_form.lock_disclaimer": "Vòstre compte es pas {locked}. Tot lo monde pòt vos sègre e veire los estatuts reservats als seguidors.", "compose_form.lock_disclaimer.lock": "clavat", "compose_form.placeholder": "A de qué pensatz ?", @@ -112,7 +113,7 @@ "emoji_button.search_results": "Resultats de recèrca", "emoji_button.symbols": "Simbòls", "emoji_button.travel": "Viatges & lòcs", - "empty_column.account_timeline": "No toots here!", + "empty_column.account_timeline": "Cap de tuts aquí !", "empty_column.blocks": "Avètz pas blocat degun pel moment.", "empty_column.community": "Lo flux public local es void. Escrivètz quicòm per lo garnir !", "empty_column.direct": "Avètz pas encara cap de messatges. Quand ne mandatz un o que ne recebètz un, serà mostrat aquí.", @@ -138,13 +139,13 @@ "getting_started.open_source_notice": "Mastodon es un logicial liure. Podètz contribuir e mandar vòstres comentaris e rapòrt de bug via {github} sus GitHub.", "getting_started.security": "Seguretat", "getting_started.terms": "Condicions d’utilizacion", - "hashtag.column_header.tag_mode.all": "and {additional}", - "hashtag.column_header.tag_mode.any": "or {additional}", - "hashtag.column_header.tag_mode.none": "without {additional}", - "hashtag.column_settings.tag_mode.all": "All of these", - "hashtag.column_settings.tag_mode.any": "Any of these", - "hashtag.column_settings.tag_mode.none": "None of these", - "hashtag.column_settings.tag_toggle": "Include additional tags in this column", + "hashtag.column_header.tag_mode.all": "e {additional}", + "hashtag.column_header.tag_mode.any": "o {additional}", + "hashtag.column_header.tag_mode.none": "sens {additional}", + "hashtag.column_settings.tag_mode.all": "Totes aquestes", + "hashtag.column_settings.tag_mode.any": "Un d’aquestes", + "hashtag.column_settings.tag_mode.none": "Cap d’aquestesNone of these", + "hashtag.column_settings.tag_toggle": "Inclure las etiquetas suplementàrias dins aquesta colomna", "home.column_settings.basic": "Basic", "home.column_settings.show_reblogs": "Mostrar los partatges", "home.column_settings.show_replies": "Mostrar las responsas", @@ -174,7 +175,7 @@ "keyboard_shortcuts.reply": "respondre", "keyboard_shortcuts.requests": "per dorbir la lista de demanda d’abonament", "keyboard_shortcuts.search": "anar a la recèrca", - "keyboard_shortcuts.start": "per dobrir la columna «Per començar»", + "keyboard_shortcuts.start": "per dobrir la colomna «Per començar»", "keyboard_shortcuts.toggle_hidden": "mostrar/amagar lo tèxte dels avertiments", "keyboard_shortcuts.toot": "començar un estatut tot novèl", "keyboard_shortcuts.unfocus": "quitar lo camp tèxte/de recèrca", @@ -321,7 +322,7 @@ "status.show_less_all": "Los tornar plegar totes", "status.show_more": "Desplegar", "status.show_more_all": "Los desplegar totes", - "status.show_thread": "Show thread", + "status.show_thread": "Mostrar lo fil", "status.unmute_conversation": "Tornar mostrar la conversacion", "status.unpin": "Tirar del perfil", "suggestions.dismiss": "Regetar la suggestion", diff --git a/config/locales/devise.oc.yml b/config/locales/devise.oc.yml index 16633e233..20a373462 100644 --- a/config/locales/devise.oc.yml +++ b/config/locales/devise.oc.yml @@ -50,8 +50,8 @@ oc: success: Sètz ben autentificat dempuèi lo compte %{kind}. passwords: no_token: Podètz pas accedir a aquesta pagina sens venir d’un corriel de reïnicializacion de senhal. S’es lo cas, mercés de verificar qu’avètz ben utilizat l’URL donada de manièra complèta. - send_instructions: Recebretz un corrièl amb las consignas per reĩnicializar vòstre senhal dins una estona. Mercés de verificar tanben vòstre dorsièr de corrièls indesirables. - send_paranoid_instructions: Se vòstra adreça de corrièl existís dins nòstra basa de donadas, recebretz un ligam per reĩnicializar vòstre senhal dins una estona. Mercés de verificar tanben vòstre dorsièr de corrièls indesirables. + send_instructions: Recebretz un corrièl amb las consignas per reïnicializar vòstre senhal dins una estona. Mercés de verificar tanben vòstre dorsièr de corrièls indesirables. + send_paranoid_instructions: Se vòstra adreça de corrièl existís dins nòstra basa de donadas, recebretz un ligam per reïnicializar vòstre senhal dins una estona. Mercés de verificar tanben vòstre dorsièr de corrièls indesirables. updated: Vòstre senhal es ben estat cambiat. Sètz ara connectat. updated_not_active: Vòstre senhal es ben estat cambiat. registrations: diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 36d5ddda4..cc5ac8a81 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -111,7 +111,7 @@ oc: remote: Alonhats title: Emplaçament login_status: Estat formulari de connexion - media_attachments: Mèdias ajustats + media_attachments: Mèdias enviats memorialize: Passar en memorial moderation: all: Tot @@ -260,7 +260,7 @@ oc: reject_media: Regetar los fichièrs mèdias reject_media_hint: Lèva los fichièrs gardats localament e regèta las demandas de telecargament dins lo futur. Servís pas a res per las suspensions reject_reports: Regetar los senhalaments - reject_reports_hint: Ignorer totes los senhalaments que venon d’aqueste domeni. Pas pertiment per las suspensions + reject_reports_hint: Ignorar totes los senhalaments que venon d’aqueste domeni. Pas pertiment per las suspensions severities: noop: Cap silence: Silenci @@ -343,7 +343,7 @@ oc: reported_account: Compte senhalat reported_by: Senhalat per resolved: Resolgut - resolved_msg: Rapòrt corrèctament resolgut  ! + resolved_msg: Rapòrt corrèctament resolgut ! status: Estatut title: Senhalament unassign: Levar @@ -352,7 +352,7 @@ oc: settings: activity_api_enabled: desc_html: Nombre d’estatuts publicats, d’utilizaires actius e de novèlas inscripcions en rapòrt setmanièr - title: Publica las estatisticas totalas de l’activitat dels utilizaires + title: Publicar las estatisticas totalas de l’activitat dels utilizaires bootstrap_timeline_accounts: desc_html: Separatz los noms d’utilizaire amb de virgula. Pas que los comptes locals e pas clavats foncionaràn. Se lo camp es void los admins seràn selecionats. title: Per defaut los nòuvenguts sègon @@ -370,13 +370,13 @@ oc: title: Imatge de la mascòta peers_api_enabled: desc_html: Noms de domeni qu’aquesta instància a trobats pel fediverse - title: Publica la lista de las instàncias conegudas + title: Publicar la lista de las instàncias conegudas preview_sensitive_media: desc_html: Los apercebuts dels ligams sus los autres sites mostraràn una vinheta encara que lo mèdia siá marcat coma sensible title: Mostrar los mèdias sensibles dins los apercebuts OpenGraph registrations: closed_message: - desc_html: Afichat sus las pagina d’acuèlh quand las inscripcions son tampadas.
Podètz utilizar de balisas HTML + desc_html: Mostrat sus las pagina d’acuèlh quand las inscripcions son tampadas.
Podètz utilizar de balisas HTML title: Messatge de barradura de las inscripcions deletion: desc_html: Autorizar lo monde a suprimir lor compte @@ -663,7 +663,7 @@ oc: one: 1 persona other: "%{count} personas" max_uses_prompt: Cap de limit - prompt: Generatz e partejatz los ligams per donar accès a aquesta instància + prompt: Generar e partejar los ligams per donar accès a aquesta instància table: expires_at: Expirats uses: Usatges From 5648b30d6c61aa22520ca13988206493e0d0f708 Mon Sep 17 00:00:00 2001 From: ThibG Date: Sat, 1 Dec 2018 18:36:41 +0100 Subject: [PATCH 4/4] Fix last_status parameter for notifications and conversations (#9407) --- app/javascript/mastodon/actions/conversations.js | 2 +- app/javascript/mastodon/actions/notifications.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/mastodon/actions/conversations.js b/app/javascript/mastodon/actions/conversations.js index aefd2fef7..3c2ea9680 100644 --- a/app/javascript/mastodon/actions/conversations.js +++ b/app/javascript/mastodon/actions/conversations.js @@ -38,7 +38,7 @@ export const expandConversations = ({ maxId } = {}) => (dispatch, getState) => { const params = { max_id: maxId }; if (!maxId) { - params.since_id = getState().getIn(['conversations', 0, 'last_status']); + params.since_id = getState().getIn(['conversations', 'items', 0, 'last_status']); } api(getState).get('/api/v1/conversations', { params }) diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js index 92c70e155..d24f39ad2 100644 --- a/app/javascript/mastodon/actions/notifications.js +++ b/app/javascript/mastodon/actions/notifications.js @@ -106,7 +106,7 @@ export function expandNotifications({ maxId } = {}, done = noOp) { }; if (!maxId && notifications.get('items').size > 0) { - params.since_id = notifications.getIn(['items', 0]); + params.since_id = notifications.getIn(['items', 0, 'id']); } dispatch(expandNotificationsRequest(isLoadingMore));