Merge branch 'main' into glitch-soc/merge-upstream

2 files changed, 8 insertions, 5 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d482ad1a2..ce25e26f9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -19,8 +19,11 @@ module ApplicationHelper
     # is looked up from the locales definition, and rails-i18n comes with
     # values that don't seem to make much sense for many languages, so
     # override these values with a default of 3 digits of precision.
-    options[:precision] = 3
-    options[:strip_insignificant_zeros] = true
+    options = options.merge(
+      precision: 3,
+      strip_insignificant_zeros: true,
+      significant: true
+    )
 
     number_to_human(number, **options)
   end
diff --git a/app/serializers/manifest_serializer.rb b/app/serializers/manifest_serializer.rb
index 4786aa760..ad05fdf6b 100644
--- a/app/serializers/manifest_serializer.rb
+++ b/app/serializers/manifest_serializer.rb
@@ -44,7 +44,7 @@ class ManifestSerializer < ActiveModel::Serializer
   end
 
   def start_url
-    '/web/timelines/home'
+    '/web/home'
   end
 
   def scope
@@ -69,7 +69,7 @@ class ManifestSerializer < ActiveModel::Serializer
     [
       {
         name: 'New toot',
-        url: '/web/statuses/new',
+        url: '/web/publish',
         icons: [
           {
             src: '/shortcuts/new-status.png',
@@ -91,7 +91,7 @@ class ManifestSerializer < ActiveModel::Serializer
       },
       {
         name: 'Direct messages',
-        url: '/web/timelines/direct',
+        url: '/web/conversations',
         icons: [
           {
             src: '/shortcuts/direct.png',