Merge remote-tracking branch 'parent/stable-4.2' into upstream-4.2.2-lts

2023-12-05 09:05:29 +09:00 · 2023-12-05 09:05:29 +09:00 · 9310c1c81b
commit 9310c1c81b
parent 129705db44 4b8fe9df73
39 changed files with 460 additions and 98 deletions
--- a/app/lib/activitypub/case_transform.rb
+++ b/app/lib/activitypub/case_transform.rb
@ -21,6 +21,8 @@ module ActivityPub::CaseTransform
                                       value
                                     elsif value.start_with?('_:')
                                       "_:#{value.delete_prefix('_:').underscore.camelize(:lower)}"
+                                     elsif LanguagesHelper::ISO_639_1_REGIONAL.key?(value.to_sym) # rubocop:disable Lint/DuplicateBranch
+                                       value
                                     else
                                       value.underscore.camelize(:lower)
                                     end