Self-hosted project management for devs and their clients: tickets, time tracking, docs and meetings, with an AI assistant that cites its sources. AGPL-3.0.
Ruby agplai-assistantdockerdsgvogdprhotwireissue-trackerjira-alternativeknowledge-basellmmcp-servermeeting-notesopen-sourceproject-managementredmine-alternativeruby-on-railsself-hostedticketingtime-tracking
Name the account page and the profile page for what they hold
Guido Boykef28a3be8fc08
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erbindex ab2e415..c2ded6e 100644--- a/app/views/devise/registrations/edit.html.erb+++ b/app/views/devise/registrations/edit.html.erb@@ -35,7 +35,7 @@</div></div>- <%# The profile picture moved to Settings > Namensanzeige+ <%# The profile picture moved to Settings > Profil(user_preferences/display): it belongs next to the name-displaychoice, and this Devise form demands the current password forevery change - unreasonable for a picture (04.09.2026). %>@@ -53,6 +53,12 @@<%= t('views.devise.registrations.edit.email_change_hint') %></small><% end %>+ <%# Who else sees this field is the member's choice (User::EmailDisplay),+ made on the profile page: said here, where the address stands. %>+ <small class="mt-1 block text-xs text-cream-700 dark:text-gray-300 leading-snug" data-shown-email-hint>+ <%= t("views.devise.registrations.edit.shown_email.#{resource.email_visibility}", email: resource.contact_email) %>+ <%= link_to t('views.devise.registrations.edit.shown_email.change'), display_user_preferences_path, class: 'underline' %>+ </small></div><% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>diff --git a/config/locales/de.yml b/config/locales/de.ymlindex 8cfd8d8..6ce0e46 100644--- a/config/locales/de.yml+++ b/config/locales/de.yml@@ -1546,14 +1546,14 @@ de:other: "%{count} ungelesene Meldungen"organisation: Organisationother_orgs_signal: Ungelesene Meldungen in anderen Organisationen- profile: Profil+ profile: Accountproject: Projektprojects: Projektesearch_project: Projekt suchen...select_organisation_prompt: Bitte wählen Sie eine Organisation aussettings: Einstellungensettings_general: Allgemein- settings_display: Namensanzeige+ settings_display: Profilsettings_tickets: Ticketssettings_meetings: Meetingssettings_datetime: Datum/Zeit@@ -3044,7 +3044,7 @@ de:first_last_initial: Vorname und abgekürzter Nachnameinitial_last: Abgekürzter Vorname und Nachnamedescription: "Die Vorschau neben jeder Option zeigt deinen eigenen Namen in der jeweiligen Schreibweise."- title: Namensanzeige+ title: Profilgeneral:future_settings: Weitere allgemeine Einstellungen werden hier in Zukunft verfügbarsein.diff --git a/config/locales/en.yml b/config/locales/en.ymlindex 93bd228..31ede6c 100644--- a/config/locales/en.yml+++ b/config/locales/en.yml@@ -1440,14 +1440,14 @@ en:other: "%{count} unread notifications"organisation: Organisationother_orgs_signal: Unread notifications in other organisations- profile: Profile+ profile: Accountproject: Projectprojects: Projectssearch_project: Search project...select_organisation_prompt: Please select an organisationsettings: Settingssettings_general: General- settings_display: Name display+ settings_display: Profilesettings_tickets: Ticketssettings_meetings: Meetingssettings_datetime: Date/Time@@ -2797,7 +2797,7 @@ en:first_last_initial: First name and abbreviated last nameinitial_last: Abbreviated first name and last namedescription: "The preview next to each option shows your own name in that spelling."- title: Name display+ title: Profilegeneral:future_settings: Additional general settings will be available here in the future.items_per_page:diff --git a/config/locales/views.de.yml b/config/locales/views.de.ymlindex 0fae890..d283683 100644--- a/config/locales/views.de.yml+++ b/config/locales/views.de.yml@@ -1072,19 +1072,24 @@ de:strength_rule: mindestens %{count} Zeichenregistrations:edit:- title: Profil+ title: Accountprofile_section: Persönliche Datenpassword_section: Passwort ändernfirst_name: Vornamelast_name: Nachnameemail_change_hint: Eine neue Adresse wird erst aktiv, wenn du den Bestätigungslink darin anklickst. Bis dahin gilt die bisherige.+ shown_email:+ login: Andere in deinen Organisationen sehen diese Adresse.+ contact: "Andere in deinen Organisationen sehen stattdessen %{email}."+ none: Andere in deinen Organisationen sehen keine E-Mail von dir.+ change: Im Profil ändernpending_confirmation: 'Warte auf Bestätigung für: %{email}'new_password: Neues Passwortleave_blank_password: Mindestens 6 Zeichenconfirm_new_password: Neues Passwort bestätigencurrent_password: Aktuelles Passwortcurrent_password_hint: zur Bestätigung der Änderungen erforderlich- save_profile: Profil speichern+ save_profile: Speichernsave_password: Passwort ändernsave_changes: Änderungen speicherndanger_zone: Gefahrenzonediff --git a/config/locales/views.en.yml b/config/locales/views.en.ymlindex e4932b3..d57a6b2 100644--- a/config/locales/views.en.yml+++ b/config/locales/views.en.yml@@ -1070,19 +1070,24 @@ en:strength_rule: at least %{count} charactersregistrations:edit:- title: Profile+ title: Accountprofile_section: Personal Informationpassword_section: Change Passwordfirst_name: First namelast_name: Last nameemail_change_hint: A new address only takes effect once you click the confirmation link sent to it. Until then the current one stays active.+ shown_email:+ login: Others in your organisations see this address.+ contact: "Others in your organisations see %{email} instead."+ none: Others in your organisations see no email of yours.+ change: Change in your profilepending_confirmation: 'Waiting for confirmation for: %{email}'new_password: New passwordleave_blank_password: Minimum 6 charactersconfirm_new_password: Confirm new passwordcurrent_password: Current passwordcurrent_password_hint: required to confirm the changes- save_profile: Save profile+ save_profile: Savesave_password: Change passwordsave_changes: Save changesdanger_zone: Danger zonediff --git a/spec/requests/user_preferences_avatar_spec.rb b/spec/requests/user_preferences_avatar_spec.rbindex 03414b4..6b182bc 100644--- a/spec/requests/user_preferences_avatar_spec.rb+++ b/spec/requests/user_preferences_avatar_spec.rb@@ -2,7 +2,7 @@require 'rails_helper'-# The profile picture lives in Settings > Namensanzeige since 04.09.2026+# The profile picture lives in Settings > Profil since 04.09.2026# (user decision): it belongs next to the name-display choice, and unlike the# Devise profile this endpoint does NOT demand the current password for a# picture change. Pins the upload without a password, the blank-fielddiff --git a/spec/requests/users/registrations_avatar_spec.rb b/spec/requests/users/registrations_avatar_spec.rbindex 6fa00ea..bafceb9 100644--- a/spec/requests/users/registrations_avatar_spec.rb+++ b/spec/requests/users/registrations_avatar_spec.rb@@ -3,7 +3,7 @@require 'rails_helper'# The profile picture MOVED out of the Devise profile into Settings >-# Namensanzeige (user decision 04.09.2026): the profile form runs through+# Profil (user decision 04.09.2026): the profile form runs through# update_with_password and demanded the current password for a picture. This# file now pins the teardown - no upload spot here, and a smuggled avatar# param is dead (unpermitted), so the password-gated path cannot come backdiff --git a/spec/requests/users/registrations_shown_email_hint_spec.rb b/spec/requests/users/registrations_shown_email_hint_spec.rbnew file mode 100644index 0000000..5f948ed--- /dev/null+++ b/spec/requests/users/registrations_shown_email_hint_spec.rb@@ -0,0 +1,69 @@+# frozen_string_literal: true++require 'rails_helper'++# The account page shows the login address, and that field is where a member+# asks who else sees it. The answer below the field follows the member's own+# choice (User::EmailDisplay), and the link leads to the page that changes it.+# Also pins the two names: "Account" for this page, "Profil" for the page that+# holds the picture and the shown email.+RSpec.describe 'Account page: who sees the email', type: :request do+ let(:user) { create(:user, email: '[email protected]') }++ before { sign_in user }++ def hint_html+ get edit_user_registration_path+ expect(response).to have_http_status(:ok)+ Nokogiri::HTML(response.body).at_css('[data-shown-email-hint]')+ end++ it 'says that others see the login address, and links to the page that changes it' do+ hint = hint_html++ expect(hint.text).to include(I18n.t('views.devise.registrations.edit.shown_email.login'))+ expect(hint.at_css('a')['href']).to eq(display_user_preferences_path)+ expect(hint.at_css('a').text).to eq(I18n.t('views.devise.registrations.edit.shown_email.change'))+ end++ it 'names the other address when the member shows one' do+ user.update!(email_visibility: 'contact', contact_email: '[email protected]')++ hint = hint_html++ expect(hint.text).to include(I18n.t('views.devise.registrations.edit.shown_email.contact',+ email: '[email protected]'))+ expect(hint.text).to include('[email protected]')+ expect(hint.at_css('a')['href']).to eq(display_user_preferences_path)+ end++ it 'says that others see no email when the member shows none' do+ user.update!(email_visibility: 'none')++ hint = hint_html++ expect(hint.text).to include(I18n.t('views.devise.registrations.edit.shown_email.none'))+ expect(hint.text).not_to include('[email protected]')+ expect(hint.at_css('a')['href']).to eq(display_user_preferences_path)+ end++ it 'has the hint in both languages' do+ %i[de en].each do |locale|+ %w[login contact none change].each do |key|+ expect(I18n.exists?("views.devise.registrations.edit.shown_email.#{key}", locale, fallback: false))+ .to be(true), "#{locale}: #{key}"+ end+ end+ end++ it 'calls the page Account and the display settings Profil' do+ expect(I18n.t('navigation.profile', locale: :de)).to eq('Account')+ expect(I18n.t('navigation.profile', locale: :en)).to eq('Account')+ expect(I18n.t('views.devise.registrations.edit.title', locale: :de)).to eq('Account')+ expect(I18n.t('views.devise.registrations.edit.title', locale: :en)).to eq('Account')+ expect(I18n.t('navigation.settings_display', locale: :de)).to eq('Profil')+ expect(I18n.t('navigation.settings_display', locale: :en)).to eq('Profile')+ expect(I18n.t('user_preferences.edit.display.title', locale: :de)).to eq('Profil')+ expect(I18n.t('user_preferences.edit.display.title', locale: :en)).to eq('Profile')+ end+enddiff --git a/spec/views/name_display_register_guard_spec.rb b/spec/views/name_display_register_guard_spec.rbindex 96304ab..97a34b7 100644--- a/spec/views/name_display_register_guard_spec.rb+++ b/spec/views/name_display_register_guard_spec.rb@@ -4,7 +4,7 @@ require 'rails_helper'# Guard: no raw user full_name renders outside the name-display register.#-# The viewer's name-display setting (Settings > Namensanzeige) only works if+# The viewer's name-display setting (Settings > Profil) only works if# every surface goes through one of the three seams:# - Neo::Users::NameComponent -> a user as an identity LABEL# - viewer_user_list(users) -> a GROUP of users (pair when one, chips when several)