Skip to content

Commit 18e7348

Browse files
Release OpenProject 12.2.2
2 parents 4772199 + cbfe813 commit 18e7348

File tree

208 files changed

+2499
-2020
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+2499
-2020
lines changed

app/controllers/activities_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def index
4545
author: @author,
4646
scope: activity_scope)
4747

48-
events = @activity.events(@date_from, @date_to)
48+
events = @activity.events(@date_from.to_datetime, @date_to.to_datetime)
4949

5050
respond_to do |format|
5151
format.html do

app/controllers/work_packages/moves_controller.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ def permitted_create_params
119119
.merge(type_id: params[:new_type_id],
120120
project_id: params[:new_project_id],
121121
journal_notes: params[:notes])
122-
.reject { |_, v| v.blank? }
122+
.compact_blank
123+
# 'none' is used in the frontend as a value to unset the property, e.g. the assignee.
124+
.transform_values { |v| v == 'none' ? nil : v }
123125
end
124126
end

app/models/type/attributes.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ module Type::Attributes
4141
links
4242
parent_id
4343
parent
44+
readonly
4445
schedule_manually].freeze
4546

4647
included do

app/models/user_preference.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,6 @@ def pause_reminders
132132
super.presence || { enabled: false }.with_indifferent_access
133133
end
134134

135-
def workdays
136-
super.presence || [1, 2, 3, 4, 5]
137-
end
138-
139135
def supported_settings_method?(method_name)
140136
UserPreferences::Schema.properties.include?(method_name.to_s.gsub(/\?|=\z/, ''))
141137
end

config/locales/crowdin/af.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ af:
741741
work_package:
742742
is_not_a_valid_target_for_time_entries: "Werkspakket #%{id} is nie 'n geldige teiken vir hertoewysing van die tyd inskrywings nie."
743743
attributes:
744+
assigned_to:
745+
format: "%{message}"
744746
due_date:
745747
not_start_date: "is not on start date, although this is required for milestones."
746748
duration:

config/locales/crowdin/ar.yml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -439,10 +439,10 @@ ar:
439439
encoded_token: "Enterprise support token"
440440
active_user_count_restriction: "Maximum active users"
441441
grids/grid:
442-
page: "Page"
443-
row_count: "Number of rows"
444-
column_count: "Number of columns"
445-
widgets: "Widgets"
442+
page: "الصفحة "
443+
row_count: "عدد الصفوف"
444+
column_count: "عدد الأعمدة"
445+
widgets: "الودجات"
446446
relation:
447447
delay: "تأخير"
448448
from: "مجموعة العمل"
@@ -630,13 +630,13 @@ ar:
630630
custom_field:
631631
at_least_one_custom_option: "At least one option needs to be available."
632632
custom_actions:
633-
only_one_allowed: "(%{name}) only one value is allowed."
634-
empty: "(%{name}) value can't be empty."
635-
inclusion: "(%{name}) value is not set to one of the allowed values."
636-
not_logged_in: "(%{name}) value cannot be set because you are not logged in."
637-
not_an_integer: "(%{name}) is not an integer."
638-
smaller_than_or_equal_to: "(%{name}) must be smaller than or equal to %{count}."
639-
greater_than_or_equal_to: "(%{name}) must be greater than or equal to %{count}."
633+
only_one_allowed: "(%{name}) مسموح بقيمة واحدة فقط."
634+
empty: "(%{name}) لا يمكن أن تكون القيمة فارغة."
635+
inclusion: "(%{name}) لم يتم تعيين القيمة على إحدى القيم المسموح بها."
636+
not_logged_in: "(%{name}) لا يمكن تعيين القيمة لأنك لم تسجل الدخول."
637+
not_an_integer: "(%{name}) ليس عددًا صحيحًا."
638+
smaller_than_or_equal_to: "(%{name}) يجب أن يكون أصغر من أو يساوي %{count}."
639+
greater_than_or_equal_to: "(%{name}) يجب أن تكون أكبر من أو تساوي %{count}."
640640
format: "%{message}"
641641
doorkeeper/application:
642642
attributes:
@@ -651,9 +651,9 @@ ar:
651651
enterprise_token:
652652
unreadable: "can't be read. Are you sure it is a support token?"
653653
grids/grid:
654-
overlaps: 'overlap.'
655-
outside: 'is outside of the grid.'
656-
end_before_start: 'end value needs to be larger than the start value.'
654+
overlaps: 'تداخل.'
655+
outside: 'هو خارج الشبكة.'
656+
end_before_start: 'يجب أن تكون قيمة النهاية أكبر من قيمة البداية.'
657657
notifications:
658658
at_least_one_channel: 'At least one channel for sending notifications needs to be specified.'
659659
attributes:
@@ -689,7 +689,7 @@ ar:
689689
project:
690690
error_not_found: "لم يتم العثور"
691691
public:
692-
error_unauthorized: "- The user has no permission to create public views."
692+
error_unauthorized: "- ليس للمستخدم إذن بإنشاء طرق عرض عامة."
693693
group_by:
694694
invalid: "Can't group by: %{value}"
695695
format: "%{message}"
@@ -745,6 +745,8 @@ ar:
745745
work_package:
746746
is_not_a_valid_target_for_time_entries: "مجموعة العمل #%{id} ليست هدفًا صالحًا لإعادة تعيين إدخالات الوقت."
747747
attributes:
748+
assigned_to:
749+
format: "%{message}"
748750
due_date:
749751
not_start_date: "ليس في تاريخ البدء، وعلى الرغم من أن هذا المطلوب للمعالم."
750752
duration:

config/locales/crowdin/az.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ az:
741741
work_package:
742742
is_not_a_valid_target_for_time_entries: "Work package #%{id} is not a valid target for reassigning the time entries."
743743
attributes:
744+
assigned_to:
745+
format: "%{message}"
744746
due_date:
745747
not_start_date: "is not on start date, although this is required for milestones."
746748
duration:

config/locales/crowdin/bg.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ bg:
741741
work_package:
742742
is_not_a_valid_target_for_time_entries: "Работен пакет #%{id} не е валидна цел за преразпределяне на времевите записи."
743743
attributes:
744+
assigned_to:
745+
format: "%{message}"
744746
due_date:
745747
not_start_date: "не е на начална дата, въпреки че това е необходимо за важни събития."
746748
duration:

0 commit comments

Comments
 (0)