From efa15b8a12c5accd76125a48d02ddbf55050cd6d Mon Sep 17 00:00:00 2001 From: sxiao Date: Thu, 23 Apr 2026 21:28:54 -0400 Subject: [PATCH 1/7] feat: localized files page toolbar and breadcrumb Replace hard coded english labels with i18n keys for buttons like refresh, new files, new directory, copy/move, and delete Add English and zh-CN strings --- apps/dashboard/app/views/files/_breadcrumb.html.erb | 6 +++--- .../app/views/files/_download_button.html.erb | 2 +- apps/dashboard/app/views/files/_upload_button.html.erb | 2 +- apps/dashboard/app/views/files/index.html.erb | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/dashboard/app/views/files/_breadcrumb.html.erb b/apps/dashboard/app/views/files/_breadcrumb.html.erb index 980ab92f98..12fd00c94d 100644 --- a/apps/dashboard/app/views/files/_breadcrumb.html.erb +++ b/apps/dashboard/app/views/files/_breadcrumb.html.erb @@ -1,6 +1,6 @@ <% if file_counter == 0 %>
  • - +
    • <% end %> @@ -10,10 +10,10 @@ <%= path_segment_with_slash(@filesystem, file.basename.to_s, file_counter, file_count) %>
  • - +
  • - +
    • <% else %>
  • diff --git a/apps/dashboard/app/views/files/_download_button.html.erb b/apps/dashboard/app/views/files/_download_button.html.erb index cfb42f21ef..7f70af2c54 100644 --- a/apps/dashboard/app/views/files/_download_button.html.erb +++ b/apps/dashboard/app/views/files/_download_button.html.erb @@ -1,5 +1,5 @@ <%- if Configuration.download_enabled? -%> <%- end -%> diff --git a/apps/dashboard/app/views/files/_upload_button.html.erb b/apps/dashboard/app/views/files/_upload_button.html.erb index 5d312a0063..a6f136f202 100644 --- a/apps/dashboard/app/views/files/_upload_button.html.erb +++ b/apps/dashboard/app/views/files/_upload_button.html.erb @@ -1,5 +1,5 @@ <%- if Configuration.upload_enabled? -%> <%- end -%> diff --git a/apps/dashboard/app/views/files/index.html.erb b/apps/dashboard/app/views/files/index.html.erb index 480f23e2a0..db0c71a932 100644 --- a/apps/dashboard/app/views/files/index.html.erb +++ b/apps/dashboard/app/views/files/index.html.erb @@ -7,9 +7,9 @@ <%= render partial: 'shell_dropdown' %> <% end %> - - - + + + <%= render(partial: 'upload_button') %> <%= render(partial: 'download_button') %> <% if Configuration.globus_endpoints %> @@ -18,8 +18,8 @@ <% if @user_configuration.files_select_target %> <%= render partial: 'send_to_target_button' %> <% end %> - - + +
    From bd13a56a3dfa70681b86ca589ec78296711c5222 Mon Sep 17 00:00:00 2001 From: sxiao Date: Thu, 23 Apr 2026 21:43:21 -0400 Subject: [PATCH 2/7] feat: localize files/turbo_frames files --- .../files/turbo_frames/_directory.html.erb | 18 +++++++++--------- .../views/files/turbo_frames/_files.html.erb | 12 +++++++----- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/apps/dashboard/app/views/files/turbo_frames/_directory.html.erb b/apps/dashboard/app/views/files/turbo_frames/_directory.html.erb index 9ef06742c5..06e9f28f63 100644 --- a/apps/dashboard/app/views/files/turbo_frames/_directory.html.erb +++ b/apps/dashboard/app/views/files/turbo_frames/_directory.html.erb @@ -5,18 +5,18 @@ - - - + + + <% private_dir = path.to_s.start_with?(CurrentUser.home) %> <% if private_dir %> - - + + <% else %> - - - - + + + + <% end %> diff --git a/apps/dashboard/app/views/files/turbo_frames/_files.html.erb b/apps/dashboard/app/views/files/turbo_frames/_files.html.erb index 994fba35f0..7ea0d040ee 100644 --- a/apps/dashboard/app/views/files/turbo_frames/_files.html.erb +++ b/apps/dashboard/app/views/files/turbo_frames/_files.html.erb @@ -3,6 +3,7 @@ <% dir_type = I18n.t('dashboard.directory') %> <%= dir_type %> + <%- if file[:directory] && readable-%>
    TypeNameActions<%= t('dashboard.files_turboframe.type') %><%= t('dashboard.files_turboframe.name') %><%= t('dashboard.files_turboframe.actions') %>SizeDate<%= t('dashboard.files_turboframe.size') %><%= t('dashboard.files_turboframe.date') %>SizeDateOwnerMode<%= t('dashboard.files_turboframe.size') %><%= t('dashboard.files_turboframe.date') %><%= t('dashboard.files_turboframe.owner') %><%= t('dashboard.files_turboframe.mode') %>
    @@ -11,7 +12,7 @@ directory_frame_path( path: "#{path.parent}" ), - title: 'Show parent directory', + title: t('dashboard.files_turboframe.show_parent_directory'), data: { turbo_frame: "project_directory" } ) %> @@ -34,6 +35,7 @@ <% type = I18n.t("dashboard.#{file[:directory] ? 'directory' : 'file'}") %> <%= type %> + @@ -42,7 +44,7 @@ directory_frame_path( path: full_path ), - title: "Show #{file[:name]} directory", + title: t('dashboard.files_turboframe.show_directory', name: file[:name]), data: { turbo_frame: "project_directory" } ) %> @@ -75,7 +77,7 @@ class: 'view-file dropdown-item', data: { row_index: nil } do %> - View + <%= t('dashboard.files_turboframe.view') %> <% end %> <% if writable %> @@ -84,7 +86,7 @@ target: '_top', class: 'edit-file dropdown-item' do %> - Edit + <%= t('dashboard.files_turboframe.edit') %> <% end %> <% end %> @@ -93,7 +95,7 @@ target: '_top', class: 'download-file dropdown-item' do %> - Download + <%= t('dashboard.files_turboframe.download') %> <% end %> From 35af694e7b2cf29a2d6667e8c3d36a023a0b0f01 Mon Sep 17 00:00:00 2001 From: sxiao Date: Thu, 23 Apr 2026 21:43:58 -0400 Subject: [PATCH 3/7] Localized the table in files page --- .../app/views/files/_files_table.html.erb | 18 +++++----- .../app/views/files/_spinner.html.erb | 2 +- apps/dashboard/config/locales/en.yml | 33 +++++++++++++++++++ apps/dashboard/config/locales/zh-CN.yml | 33 +++++++++++++++++++ apps/dashboard/config/ondemand.d/ondemand.yml | 4 +++ 5 files changed, 80 insertions(+), 10 deletions(-) create mode 100644 apps/dashboard/config/ondemand.d/ondemand.yml diff --git a/apps/dashboard/app/views/files/_files_table.html.erb b/apps/dashboard/app/views/files/_files_table.html.erb index 2565ed55a3..5da6da207c 100755 --- a/apps/dashboard/app/views/files/_files_table.html.erb +++ b/apps/dashboard/app/views/files/_files_table.html.erb @@ -5,22 +5,22 @@
    - Select All + <%= t('dashboard.files_select_all') %> - - - - - - - + + + + + + + diff --git a/apps/dashboard/app/views/files/_spinner.html.erb b/apps/dashboard/app/views/files/_spinner.html.erb index 76a0a63519..91dcd00098 100644 --- a/apps/dashboard/app/views/files/_spinner.html.erb +++ b/apps/dashboard/app/views/files/_spinner.html.erb @@ -1,5 +1,5 @@
    \ No newline at end of file diff --git a/apps/dashboard/config/locales/en.yml b/apps/dashboard/config/locales/en.yml index ac890393a4..76eecaba66 100644 --- a/apps/dashboard/config/locales/en.yml +++ b/apps/dashboard/config/locales/en.yml @@ -142,21 +142,54 @@ en: development_apps_caption: Sandbox App directory: Directory edit: Edit + files_turboframe: + size: Size + date: Date + owner: Owner + mode: Mode + actions: Actions + type: Type + name: Name + view: View + edit: Edit + download: Download + show_parent_directory: Show parent directory + show_directory: Show %{name} directory + files_select_all: Select All + files_select: Select + files_type: Type + files_name: Name + files_actions: Actions + files_size: Size + files_modified_at: Modified at + files_owner: Owner + files_mode: Mode + loading: Loading... file: File file_quotas: File Quotas + files_change_directory: Change Directory + files_copy_path: Copy Path + files_copy_move: Copy/Move + files_delete: Delete files_directory_download_error_modal_title: Directory too large to download files_directory_download_unauthorized: You can only download a file or directory that you have read and execute access to files_directory_size_calculation_error: Timeout while trying to determine directory size. files_directory_size_calculation_timeout: Timeout while trying to determine directory size. files_directory_size_unknown: 'Error with status %{exit_code} when trying to determine directory size: %{error}' files_directory_too_large: The directory is too large to download as a zip. The directory should be less than %{download_directory_size_limit} bytes. + files_download: Download files_download_not_enabled: Downloading files is not enabled on this server. files_download_zip: Download as zip files_file_too_large: The file is too large to download. File downloads should be less than %{download_file_size_limit} bytes. + files_go_up_directory: Go up directory + files_new_directory: New Directory + files_new_file: New File + files_refresh: Refresh files_remote_dir_not_created: Did not create directory %{path} files_remote_disabled: Remote file support is not enabled files_remote_empty_dir_unsupported: Remote does not support empty directories files_remote_error_listing_remotes: 'Error listing Rclone remotes: %{error}' + files_upload: Upload files_send_to_target_title_default: Send selected files metadata to the external application files_shell: Open in Terminal files_shell_dropdown: Select Cluster to Open in Terminal diff --git a/apps/dashboard/config/locales/zh-CN.yml b/apps/dashboard/config/locales/zh-CN.yml index 61265dbf68..1b60ba95d8 100644 --- a/apps/dashboard/config/locales/zh-CN.yml +++ b/apps/dashboard/config/locales/zh-CN.yml @@ -129,7 +129,34 @@ zh-CN: directory: 目录 edit: 编辑 file: 文件 + files_turboframe: + size: 大小 + date: 日期 + owner: 所有者 + mode: 模式 + actions: 操作 + type: 类型 + name: 名称 + view: 查看 + edit: 编辑 + download: 下载 + show_parent_directory: 显示父目录 + show_directory: 显示 %{name} 目录 + files_select_all: 选择所有 + files_select: 选择 + files_type: 类型 + files_name: 名称 + files_actions: 操作 + files_size: 大小 + files_modified_at: 修改时间 + files_owner: 所有者 + files_mode: 模式 + loading: 加载中 file_quotas: 文件配额 + files_change_directory: 更改目录 + files_copy_path: 复制路径 + files_copy_move: 复制/移动 + files_delete: 删除 files_directory_download_error_modal_title: 目录太大，无法下载 files_directory_download_unauthorized: 您只能下载您具有读取和执行权限的文件或目录 files_directory_size_calculation_error: 尝试确定目录大小时超时。 @@ -139,12 +166,18 @@ zh-CN: files_doesnt_exist: "%{path} 不存在。" files_download_not_enabled: 此服务器上未启用文件下载。 files_download_zip: 下载为 zip + files_download: 下载 files_file_too_large: 文件太大，无法下载。文件下载应小于 %{download_file_size_limit} 字节。 + files_go_up_directory: 上移目录 + files_new_directory: 新目录 + files_new_file: 新文件 files_not_readable: 您没有足够的权限读取 '%{path}'。 + files_refresh: 刷新 files_remote_dir_not_created: 未创建目录 %{path} files_remote_disabled: 未启用远程文件支持 files_remote_empty_dir_unsupported: 远程不支持空目录 files_remote_error_listing_remotes: 列出 Rclone 远程时出错：%{error} + files_upload: 上传 files_send_to_target_title_default: 将选定文件的元数据发送到外部应用程序 files_shell: 在终端中打开 files_shell_dropdown: 选择要在终端中打开的集群 diff --git a/apps/dashboard/config/ondemand.d/ondemand.yml b/apps/dashboard/config/ondemand.d/ondemand.yml new file mode 100644 index 0000000000..4c49be9c61 --- /dev/null +++ b/apps/dashboard/config/ondemand.d/ondemand.yml @@ -0,0 +1,4 @@ +pinned_apps: + - sys/* +pinned_apps_menu_length: 4 +pinned_apps_group_by: category From 99e251839887e1345060484fa09448721ebe20f7 Mon Sep 17 00:00:00 2001 From: sxiao Date: Thu, 23 Apr 2026 21:50:34 -0400 Subject: [PATCH 4/7] feat: localize files/edit page --- apps/dashboard/app/views/files/edit.html.erb | 18 +++++++++--------- apps/dashboard/config/locales/en.yml | 10 ++++++++++ apps/dashboard/config/locales/zh-CN.yml | 10 ++++++++++ 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/apps/dashboard/app/views/files/edit.html.erb b/apps/dashboard/app/views/files/edit.html.erb index e31a38330a..27e4b4b986 100644 --- a/apps/dashboard/app/views/files/edit.html.erb +++ b/apps/dashboard/app/views/files/edit.html.erb @@ -8,7 +8,7 @@
    @@ -16,15 +16,15 @@
    <%= "Contents of directory #{@path}" %>
    - Select + <%= t('dashboard.files_select') %> TypeNameActionsSizeModified atOwnerMode<%= t('dashboard.files_type') %><%= t('dashboard.files_name') %><%= t('dashboard.files_actions') %><%= t('dashboard.files_size') %><%= t('dashboard.files_modified_at') %><%= t('dashboard.files_owner') %><%= t('dashboard.files_mode') %>
    - + - - - - + + + + - - + + diff --git a/apps/dashboard/app/views/files/_upload_button.html.erb b/apps/dashboard/app/views/files/_upload_button.html.erb index a6f136f202..af7574f7e6 100644 --- a/apps/dashboard/app/views/files/_upload_button.html.erb +++ b/apps/dashboard/app/views/files/_upload_button.html.erb @@ -1,5 +1,5 @@ <%- if Configuration.upload_enabled? -%> <%- end -%> diff --git a/apps/dashboard/app/views/files/turbo_frames/_directory.html.erb b/apps/dashboard/app/views/files/turbo_frames/_directory.html.erb index 06e9f28f63..2231c362f2 100644 --- a/apps/dashboard/app/views/files/turbo_frames/_directory.html.erb +++ b/apps/dashboard/app/views/files/turbo_frames/_directory.html.erb @@ -5,18 +5,18 @@
    <%= "Contents of directory #{@path}" %> <%= t('dashboard.files_contents_of_directory', path: @path) %>
    - <%= t('dashboard.files_select') %> + <%= t('dashboard.select') %> <%= t('dashboard.files_type') %><%= t('dashboard.files_name') %><%= t('dashboard.files_actions') %><%= t('dashboard.files_size') %><%= t('dashboard.type') %><%= t('dashboard.name') %><%= t('dashboard.actions') %><%= t('dashboard.size') %> <%= t('dashboard.files_modified_at') %><%= t('dashboard.files_owner') %><%= t('dashboard.files_mode') %><%= t('dashboard.owner') %><%= t('dashboard.mode') %>
    - - - + + + <% private_dir = path.to_s.start_with?(CurrentUser.home) %> <% if private_dir %> - - + + <% else %> - - - - + + + + <% end %> diff --git a/apps/dashboard/app/views/files/turbo_frames/_files.html.erb b/apps/dashboard/app/views/files/turbo_frames/_files.html.erb index 7ea0d040ee..59ea597704 100644 --- a/apps/dashboard/app/views/files/turbo_frames/_files.html.erb +++ b/apps/dashboard/app/views/files/turbo_frames/_files.html.erb @@ -12,7 +12,7 @@ directory_frame_path( path: "#{path.parent}" ), - title: t('dashboard.files_turboframe.show_parent_directory'), + title: t('dashboard.files_show_parent_directory'), data: { turbo_frame: "project_directory" } ) %> @@ -44,7 +44,7 @@ directory_frame_path( path: full_path ), - title: t('dashboard.files_turboframe.show_directory', name: file[:name]), + title: t('dashboard.files_show_directory', name: file[:name]), data: { turbo_frame: "project_directory" } ) %> @@ -77,7 +77,7 @@ class: 'view-file dropdown-item', data: { row_index: nil } do %> - <%= t('dashboard.files_turboframe.view') %> + <%= t('dashboard.view') %> <% end %> <% if writable %> @@ -86,7 +86,7 @@ target: '_top', class: 'edit-file dropdown-item' do %> - <%= t('dashboard.files_turboframe.edit') %> + <%= t('dashboard.edit') %> <% end %> <% end %> @@ -95,7 +95,7 @@ target: '_top', class: 'download-file dropdown-item' do %> - <%= t('dashboard.files_turboframe.download') %> + <%= t('dashboard.download') %> <% end %> diff --git a/apps/dashboard/config/locales/en.yml b/apps/dashboard/config/locales/en.yml index 407fe50685..b898c688c8 100644 --- a/apps/dashboard/config/locales/en.yml +++ b/apps/dashboard/config/locales/en.yml @@ -150,27 +150,9 @@ en: wrap: Wrap editor_key_bindings: Key Bindings editor_key_bindings_default: Default - files_turboframe: - size: Size - date: Date - owner: Owner - actions: Actions - type: Type - name: Name - view: View - edit: Edit - download: Download - show_parent_directory: Show parent directory - show_directory: Show %{name} directory files_select_all: Select All - files_select: Select - files_type: Type - files_name: Name - files_actions: Actions - files_size: Size + select: Select files_modified_at: Modified at - files_owner: Owner - files_mode: Mode loading: Loading... file: File file_quotas: File Quotas @@ -360,6 +342,9 @@ en:
    Custom shared apps are available below. shell_app_title: "%{cluster_title} Shell Access" show: Show + files_contents_of_directory: "Contents of directory %{path}" + files_show_directory: Show %{name} directory + files_show_parent_directory: Show parent directory size: Size skip_navigation: Skip Navigation soft_tabs: Soft Tabs @@ -387,6 +372,10 @@ en: validation_error: Invalid Request. Please review the error messages below system_apps_caption: System Installed App type: Type + actions: Actions + download: Download + upload: Upload + view: View unknown: Unknown uppy: Uppy user_configuration: diff --git a/apps/dashboard/config/locales/zh-CN.yml b/apps/dashboard/config/locales/zh-CN.yml index c69ffab8ed..444357840c 100644 --- a/apps/dashboard/config/locales/zh-CN.yml +++ b/apps/dashboard/config/locales/zh-CN.yml @@ -121,6 +121,7 @@ zh-CN: close: 关闭 close_alert: 关闭此警报。 close_notice: 关闭此通知。 + files_contents_of_directory: "目录内容 %{path}" custom_pages: invalid: 无效的页面代码：%{page}。此页面尚未配置 date: 日期 @@ -137,28 +138,9 @@ zh-CN: editor_key_bindings: 键绑定 editor_key_bindings_default: 默认 file: 文件 - files_turboframe: - size: 大小 - date: 日期 - owner: 所有者 - mode: 模式 - actions: 操作 - type: 类型 - name: 名称 - view: 查看 - edit: 编辑 - download: 下载 - show_parent_directory: 显示父目录 - show_directory: 显示 %{name} 目录 files_select_all: 选择所有 - files_select: 选择 - files_type: 类型 - files_name: 名称 - files_actions: 操作 - files_size: 大小 + select: 选择 files_modified_at: 修改时间 - files_owner: 所有者 - files_mode: 模式 loading: 加载中 file_quotas: 文件配额 files_change_directory: 更改目录 @@ -347,6 +329,8 @@ zh-CN:
    自定义共享应用程序可以在下面使用。 shell_app_title: "%{cluster_title} Shell 访问" show: 显示 + files_show_directory: 显示 %{name} 目录 + files_show_parent_directory: 显示父目录 size: 大小 skip_navigation: 跳过导航 soft_tabs: 软制表符 @@ -374,6 +358,10 @@ zh-CN: validation_error: 无效请求。请查看下面的错误信息 system_apps_caption: 系统已安装应用 type: 类型 + actions: 操作 + download: 下载 + upload: 上传 + view: 查看 unknown: 未知 uppy: Uppy user_configuration:
    <%= t('dashboard.files_turboframe.type') %><%= t('dashboard.files_turboframe.name') %><%= t('dashboard.files_turboframe.actions') %><%= t('dashboard.type') %><%= t('dashboard.name') %><%= t('dashboard.actions') %><%= t('dashboard.files_turboframe.size') %><%= t('dashboard.files_turboframe.date') %><%= t('dashboard.size') %><%= t('dashboard.date') %><%= t('dashboard.files_turboframe.size') %><%= t('dashboard.files_turboframe.date') %><%= t('dashboard.files_turboframe.owner') %><%= t('dashboard.files_turboframe.mode') %><%= t('dashboard.size') %><%= t('dashboard.date') %><%= t('dashboard.owner') %><%= t('dashboard.mode') %>