Finish renaming Display settings -> Preferences #28336
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Aryan-81
changed the title
display-settings-form -> preferences-form
Aryan-81
changed the title
Aryan-81
changed the title
fixes a part of zulip#26874
…hoice-labeld` fixes a part of zulip#26874
fixes a part of zulip#26874
fixes a part of zulip#26874
…eferences`" This reverts commit 0e9067c.
changes file name 'display_settings.hbs' -> 'preferences.hbs' fixes a part of zulip#26874
fixes a part of zulip#26874
`display_settings_section`->`preferences_section` fixes a part of zulip#26874
|
Heads up @Aryan-81, we just merged some commits that conflict with the changes you made in this pull request! You can review this repository's recent commits to see where the conflicts occur. Please rebase your feature branch against the |
|
Closing, since we must have merged work towards this on another PR, given the merge conflicts. In any case, the PR is very messy with merge conflicts and I'd recommend reading our Git guide to learn how to not do that. Check out our GitHub guide and commit guidelines for more details. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #26874
PR Finish renaming
display-settings-form->preferences-formzulip\web\styles\settings.css
zulip\web\templates\settings\display_settings.hbs
display-settings-radio-choice-label->preferences-radio-choice-labeldzulip\web\styles\settings.css
zulip\web\templates\settings\display_settings.hbs
emoji-display-settings-status->emoji-preferences-statuszulip\web\src\settings_display.js
emoji-display-settings->emoji-preferencesweb\templates\settings\display_settings.hbs
display_settings_legacy->preferences_legacyzulip\zerver\actions\user_settings.py
zulip\zerver\lib\events.py
zulip\zerver\models\users.py
zulip\zerver\tests\test_events.py
zulip\zerver\tests\test_event_system.py
display_settings_labels->preferences_labelszulip\web\src\settings.js
zulip\web\src\settings_config.ts
get_all_display_settings->get_all_preferenceszulip\web\src\admin.js
zulip\web\src\settings.js
zulip\web\src\settings_config.ts
_check_update_display_settings->_check_update_preferenceszulip\zerver\lib\event_schema.py
display_settings->preferenceszulip\web\src\admin.js
zulip\web\src\settings.js
zulip\web\templates\settings\display_settings.hbs
zulip\web\templates\settings\organization_user_settings_defaults.hbs
zulip\web\templates\settings\user_display_settings.hbs
zulip\web\tests\i18n.test.js
'display_settings.hbs' -> 'preferences.hbs'
display_settings_section->preferences_sectionzulip\web\e2e-tests\settings.test.ts