l3dlp-sandbox · pull · Nov 3, 2023 · Oct 24, 2023 · Oct 24, 2023 · Oct 30, 2023
diff --git a/app/components/users/avatar_component.rb b/app/components/users/avatar_component.rb
@@ -32,7 +32,7 @@ class AvatarComponent < ApplicationComponent
     include AvatarHelper
     include OpPrimer::ComponentHelpers
 
-    def initialize(user:, show_name: true, link: true, size: 'default', classes: '', title: nil)
+    def initialize(user:, show_name: true, link: true, size: 'default', classes: '', title: nil, name_classes: '')
       super
 
       @user = user
@@ -41,6 +41,7 @@ def initialize(user:, show_name: true, link: true, size: 'default', classes: '',
       @size = size
       @title = title
       @classes = classes
+      @name_classes = name_classes
     end
 
     def render?
@@ -54,7 +55,8 @@ def call
         link: @link,
         hide_name: !@show_name,
         title: @title,
-        class: @classes
+        class: @classes,
+        name_classes: @name_classes
       )
     end
   end

diff --git a/app/components/work_packages/share/concerns/authorization.rb b/app/components/work_packages/share/concerns/authorization.rb
@@ -36,7 +36,7 @@ module Authorization
 
         included do
           def sharing_manageable?
-            User.current.allowed_to?(:share_work_packages, @work_package.project)
+            User.current.allowed_in_project?(:share_work_packages, @work_package.project)
           end
         end
       end

diff --git a/app/models/users/permission_checks.rb b/app/models/users/permission_checks.rb
@@ -96,7 +96,6 @@ def all_permissions_for(context)
   end
 
   # Old allowed_to? interface. Marked as deprecated, should be removed at some point ... Guessing 14.0?
-
   def allowed_to?(action, context, global: false)
     # OpenProject::Deprecation.deprecate_method(User, :allowed_to?)
     user_allowed_service.call(action, context, global:)

diff --git a/config/locales/crowdin/zh-CN.seeders.yml b/config/locales/crowdin/zh-CN.seeders.yml
@@ -132,21 +132,21 @@ zh-CN:
       welcome:
         title: 欢迎使用 OpenProject！
         text: |
-          OpenProject is the leading open source project management software. It supports classic, agile as well as hybrid project management and gives you full control over your data.
+          OpenProject是领先的开源项目管理软件。它支持经典、敏捷和混合型项目管理，并由您完全掌握自己的数据。
 
-          Core features and use cases:
+          核心功能和用例：
 
-          * [Project Portfolio Management](https://www.openproject.org/collaboration-software-features/project-portfolio-management/)
-          * [Project Planning and Scheduling](https://www.openproject.org/collaboration-software-features/project-planning-scheduling/)
-          * [Task Management and Issue Tracking](https://www.openproject.org/collaboration-software-features/task-management/)
-          * [Agile Boards (Scrum and Kanban)](https://www.openproject.org/collaboration-software-features/agile-project-management/)
-          * [Requirements Management and Release Planning](https://www.openproject.org/collaboration-software-features/product-development/)
-          * [Time and Cost Tracking, Budgets](https://www.openproject.org/collaboration-software-features/time-tracking/)
-          * [Team Collaboration and Documentation](https://www.openproject.org/collaboration-software-features/team-collaboration/)
+          * [项目组合管理](https://www.openproject.org/collaboration-software-features/project-portfolio-management/)
+          * [项目规划和调度](https://www.openproject.org/collaboration-software-features/project-planning-scheduling/)
+          * [任务管理和问题跟踪](https://www.openproject.org/collaboration-software-features/task-management/)
+          * [敏捷看板（Scrum和Kanban）](https://www.openproject.org/collaboration-software-features/agile-project-management/)
+          * [需求管理和发布计划](https://www.openproject.org/collaboration-software-features/product-development/)
+          * [时间和成本跟踪/预算](https://www.openproject.org/collaboration-software-features/time-tracking/)
+          * [团队协作和文档](https://www.openproject.org/collaboration-software-features/team-collaboration/)
 
-          Welcome to the future of project management.
+          欢迎来到项目管理的未来。
 
-          For Admins: You can change this welcome text [here]({{opSetting:base_url}}/admin/settings/general).
+          对于管理员：您可以[在此]({{opSetting:base_url}}/admin/settings/general)更改此欢迎文本。
       projects:
         demo-project:
           name: 演示项目

diff --git a/config/locales/crowdin/zh-CN.yml b/config/locales/crowdin/zh-CN.yml
@@ -882,7 +882,7 @@ zh-CN:
           attributes:
             base:
               user_limit_reached: "已达到用户限制。当前方案无法创建更多帐户。"
-              one_must_be_active: "Admin User cannot be locked/removed. At least one admin must be active."
+              one_must_be_active: "管理员用户无法被锁定/移除。必须至少有一个管理员处于激活状态。"
             password_confirmation:
               confirmation: "确认密码与密码不一致。"
               format: "%{message}"

diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile
@@ -2,7 +2,7 @@
 ARG RUBY_VERSION
 FROM ruby:${RUBY_VERSION}-bullseye
 
-ENV NODE_VERSION="16.17.0"
+ENV NODE_VERSION="20.9.0"
 ENV BUNDLER_VERSION="2.4.21"
 ENV DEBIAN_FRONTEND=noninteractive
 ENV BUNDLE_WITHOUT="development:production:docker"

diff --git a/docker/dev/backend/Dockerfile b/docker/dev/backend/Dockerfile
@@ -6,6 +6,7 @@ ARG DEV_GID=1001
 
 ENV USER=dev
 ENV RAILS_ENV=development
+ENV NODE_MAJOR=20
 
 ENV BUNDLER_VERSION "2.4.7"
 
@@ -27,7 +28,10 @@ RUN apt-get update -qq && \
 
 # Setup node source and install nodejs. Needed for running certain scripts in backend container,
 # as the `./scripts/api/validate_spec`.
-RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash -
+RUN mkdir -p /etc/apt/keyrings
+RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+RUN apt-get update
 RUN apt-get install -y nodejs
 
 # Install watchexec for continuous test execution.

diff --git a/docker/dev/frontend/Dockerfile b/docker/dev/frontend/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16.15
+FROM node:20.9
 MAINTAINER [email protected]
 
 ARG DEV_UID=1000

diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile
@@ -1,5 +1,5 @@
 ARG RUBY_VERSION="3.2.2"
-ARG NODE_VERSION="16.17.0"
+ARG NODE_VERSION="20.9.0"
 ARG BUNDLER_VERSION="2.4.7"
 ARG DEBIAN_FRONTEND=noninteractive
 

diff --git a/docker/pullpreview-storybook/Dockerfile b/docker/pullpreview-storybook/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16.17 as build
+FROM node:20.9 as build
 
 COPY . /build
 WORKDIR /build/frontend

diff --git a/docs/development/development-environment-osx/README.md b/docs/development/development-environment-osx/README.md
@@ -104,11 +104,11 @@ $ nodenv init
 
 You can find the latest LTS version here: [nodejs.org/en/download](https://nodejs.org/en/download/)
 
-At the time of writing this is v16.17.0. Install and activate it with:
+At the time of writing this is v20.9.0. Install and activate it with:
 
 ```shell
-nodenv install 16.17.0
-nodenv global 16.17.0
+nodenv install 20.9.0
+nodenv global 20.9.0
 ```
 
 ### Update NPM to the latest version
@@ -129,10 +129,10 @@ $ bundler --version
 Bundler version 2.4.7
 
 node --version
-v16.17.0
+v20.9.0
 
 npm --version
-8.12.1
+10.1.0
 ```
 
 # Install OpenProject

diff --git a/docs/installation-and-operations/installation/manual/README.md b/docs/installation-and-operations/installation/manual/README.md
@@ -144,7 +144,7 @@ time to finish.
 To check our Node installation we run `node --version`. It should output something very similar to:
 
 ```
-v16.17.0
+v20.9.0
 ```
 
 ## Installation of OpenProject