Bump version to 2.0.0rc4

* Dutch: A few strings I found last minute

* Update simple_form.nl.yml

app/javascript/mastodon/components/status_content.js

@@ -122,6 +122,7 @@ export default class StatusContent extends React.PureComponent {
     const directionStyle = { direction: 'ltr' };
     const classNames = classnames('status__content', {
       'status__content--with-action': this.props.onClick && this.context.router,
+      'status__content--with-spoiler': status.get('spoiler_text').length > 0,
     });
 
     if (isRtl(status.get('search_index'))) {
@@ -153,7 +154,7 @@ export default class StatusContent extends React.PureComponent {
 
           {mentionsPlaceholder}
 
-          <div tabIndex={!hidden && 0} className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''}`} style={directionStyle} dangerouslySetInnerHTML={content} />
+          <div tabIndex={!hidden ? 0 : null} className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''}`} style={directionStyle} dangerouslySetInnerHTML={content} />
         </div>
       );
     } else if (this.props.onClick) {

app/javascript/mastodon/locales/ca.json

@@ -159,11 +159,11 @@
   "privacy.public.short": "Públic",
   "privacy.unlisted.long": "No publicar en línies de temps públiques",
   "privacy.unlisted.short": "No llistat",
-  "relative_time.days": "{number}d",
+  "relative_time.days": "fa {number} jorns",
-  "relative_time.hours": "{number}h",
+  "relative_time.hours": "fa {number} hores",
-  "relative_time.just_now": "now",
+  "relative_time.just_now": "ara",
-  "relative_time.minutes": "{number}m",
+  "relative_time.minutes": "fa {number} minutes",
-  "relative_time.seconds": "{number}s",
+  "relative_time.seconds": "fa {number} segondes",
   "reply_indicator.cancel": "Cancel·lar",
   "report.placeholder": "Comentaris addicionals",
   "report.submit": "Enviar",

app/javascript/mastodon/locales/es.json

@@ -161,7 +161,7 @@
   "privacy.unlisted.short": "Sin federar",
   "relative_time.days": "{number}d",
   "relative_time.hours": "{number}h",
-  "relative_time.just_now": "now",
+  "relative_time.just_now": "ahora",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "reply_indicator.cancel": "Cancelar",

app/javascript/mastodon/locales/fr.json

@@ -63,7 +63,7 @@
   "confirmations.mute.message": "Confirmez-vous le masquage de {name} ?",
   "confirmations.unfollow.confirm": "Ne plus suivre",
   "confirmations.unfollow.message": "Voulez-vous arrêter de suivre {name} ?",
-  "embed.instructions": "Intégrez ce statut à votre site en copiant ce code ci-dessous.",
+  "embed.instructions": "Intégrez ce statut à votre site en copiant le code ci-dessous.",
   "embed.preview": "Il apparaîtra comme cela : ",
   "emoji_button.activity": "Activités",
   "emoji_button.custom": "Personnalisés",
@@ -159,11 +159,11 @@
   "privacy.public.short": "Public",
   "privacy.unlisted.long": "Ne pas afficher dans les fils publics",
   "privacy.unlisted.short": "Non-listé",
-  "relative_time.days": "{number}d",
+  "relative_time.days": "il y a {number} jour",
-  "relative_time.hours": "{number}h",
+  "relative_time.hours": "il y a {number}h",
-  "relative_time.just_now": "now",
+  "relative_time.just_now": "à l’instant",
-  "relative_time.minutes": "{number}m",
+  "relative_time.minutes": "il y a {number} min.",
-  "relative_time.seconds": "{number}s",
+  "relative_time.seconds": "il y a {number}s",
   "reply_indicator.cancel": "Annuler",
   "report.placeholder": "Commentaires additionnels",
   "report.submit": "Envoyer",

app/javascript/mastodon/locales/oc.json

@@ -159,11 +159,11 @@
   "privacy.public.short": "Public",
   "privacy.unlisted.long": "Mostrar pas dins los fluxes publics",
   "privacy.unlisted.short": "Pas-listat",
-  "relative_time.days": "{number}d",
+  "relative_time.days": "fa {number}j",
-  "relative_time.hours": "{number}h",
+  "relative_time.hours": "fa {number}h",
-  "relative_time.just_now": "now",
+  "relative_time.just_now": "ara",
-  "relative_time.minutes": "{number}m",
+  "relative_time.minutes": "fa {number} minutas",
-  "relative_time.seconds": "{number}s",
+  "relative_time.seconds": "fa {number} segondas",
   "reply_indicator.cancel": "Anullar",
   "report.placeholder": "Comentaris addicionals",
   "report.submit": "Mandar",

app/javascript/mastodon/reducers/timelines.js

@@ -75,15 +75,9 @@ const updateTimeline = (state, timeline, status, references) => {
   }));
 };
 
-const deleteStatus = (state, id, accountId, references, reblogOf) => {
+const deleteStatus = (state, id, accountId, references) => {
   state.keySeq().forEach(timeline => {
-    state = state.updateIn([timeline, 'items'], list => {
+    state = state.updateIn([timeline, 'items'], list => list.filterNot(item => item === id));
-      if (reblogOf && !list.includes(reblogOf)) {
-        return list.map(item => item === id ? reblogOf : item);
-      } else {
-        return list.filterNot(item => item === id);
-      }
-    });
   });
 
   // Remove reblogs of deleted status

app/javascript/styles/application.scss

@@ -1,22 +1,22 @@
-@import 'mixins';
+@import 'mastodon/mixins';
-@import 'variables';
+@import 'mastodon/variables';
 @import 'fonts/roboto';
 @import 'fonts/roboto-mono';
 @import 'fonts/montserrat';
 
-@import 'reset';
+@import 'mastodon/reset';
-@import 'basics';
+@import 'mastodon/basics';
-@import 'containers';
+@import 'mastodon/containers';
-@import 'lists';
+@import 'mastodon/lists';
-@import 'footer';
+@import 'mastodon/footer';
-@import 'compact_header';
+@import 'mastodon/compact_header';
-@import 'landing_strip';
+@import 'mastodon/landing_strip';
-@import 'forms';
+@import 'mastodon/forms';
-@import 'accounts';
+@import 'mastodon/accounts';
-@import 'stream_entries';
+@import 'mastodon/stream_entries';
-@import 'components';
+@import 'mastodon/components';
-@import 'emoji_picker';
+@import 'mastodon/emoji_picker';
-@import 'about';
+@import 'mastodon/about';
-@import 'tables';
+@import 'mastodon/tables';
-@import 'admin';
+@import 'mastodon/admin';
-@import 'rtl';
+@import 'mastodon/rtl';

app/javascript/styles/mastodon/basics.scss

@@ -30,7 +30,7 @@ body {
   }
 
   &.app-body {
-    position: fixed;
+    position: absolute;
     width: 100%;
     height: 100%;
     padding: 0;

app/javascript/styles/mastodon/components.scss

@@ -511,6 +511,14 @@
   overflow: hidden;
   white-space: pre-wrap;
 
+  &.status__content--with-spoiler {
+    white-space: normal;
+
+    .status__content__text {
+      white-space: pre-wrap;
+    }
+  }
+
   .emojione {
     width: 18px;
     height: 18px;

app/lib/activitypub/activity.rb

@@ -67,9 +67,14 @@ class ActivityPub::Activity
   end
 
   def distribute(status)
+    crawl_links(status)
+
+    # Only continue if the status is supposed to have
+    # arrived in real-time
+    return unless @options[:override_timestamps]
+
     notify_about_reblog(status) if reblog_of_local_account?(status)
     notify_about_mentions(status)
-    crawl_links(status)
     distribute_to_followers(status)
   end
 

app/lib/ostatus/activity/creation.rb

@@ -56,7 +56,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
     Rails.logger.debug "Queuing remote status #{status.id} (#{id}) for distribution"
 
     LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text?
-    DistributionWorker.perform_async(status.id)
+    DistributionWorker.perform_async(status.id) if @options[:override_timestamps]
 
     status
   end

app/services/fetch_link_card_service.rb

@@ -3,7 +3,7 @@
 class FetchLinkCardService < BaseService
   URL_PATTERN = %r{
     (                                                                                                 #   $1 URL
-      (https?:\/\/)?                                                                                  #   $2 Protocol (optional)
+      (https?:\/\/)                                                                                   #   $2 Protocol (required)
       (#{Twitter::Regex[:valid_domain]})                                                              #   $3 Domain(s)
       (?::(#{Twitter::Regex[:valid_port_number]}))?                                                   #   $4 Port number (optional)
       (/#{Twitter::Regex[:valid_url_path]}*)?                                                         #   $5 URL Path and anchor

config/locales/simple_form.fr.yml

@@ -44,6 +44,7 @@ fr:
         setting_default_sensitive: Toujours marquer les médias comme sensibles
         setting_delete_modal: Afficher une fenêtre de confirmation avant de supprimer un pouet
         setting_noindex: Demander aux moteurs de recherche de ne pas indexer vos informations personnelles
+        setting_reduce_motion: Réduire la vitesse des animations
         setting_system_font_ui: Utiliser la police par défaut du système
         setting_theme: Thème du site
         setting_unfollow_modal: Afficher une fenêtre de confirmation avant de vous désabonner d’un compte

config/locales/simple_form.nl.yml

@@ -4,13 +4,17 @@ nl:
     hints:
       defaults:
         avatar: PNG, GIF of JPG. Maximaal 2MB. Wordt teruggeschaald naar 120x120px
-        display_name: Maximaal 30 tekens
+        digest: Wordt na een lange periode van inactiviteit verzonden, met een samenvatting van vermeldingen tijdens je afwezigheid.
+        display_name:
+          one: <span class="name-counter">1</span> teken over
+          other: <span class="name-counter">%{count}</span> tekens over
         header: PNG, GIF of JPG. Maximaal 2MB. Wordt teruggeschaald naar 700x335px
         locked: Vereist dat je handmatig volgers moet accepteren en stelt de privacy van toots standaard in op alleen volgers
         note:
           one: <span class="note-counter">1</span> teken over
           other: <span class="note-counter">%{count}</span> tekens over
         setting_noindex: Heeft invloed op jouw openbare profiel en toots
+        setting_theme: Heeft invloed op hoe de webapp van Mastodon er uit ziet, op elk apparaat waarmee je inlogt.
       imports:
         data: CSV-bestand dat op een andere Mastodon-server werd geëxporteerd
       sessions:

lib/mastodon/version.rb

@@ -21,7 +21,7 @@ module Mastodon
     end
 
     def flags
-      'rc3'
+      'rc4'
     end
 
     def to_a