Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: "You viewed/edited/created this" (backport #17365) #17402

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 4, 2022

This is an automatic backport of pull request #17365 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

### Issues
In the form timeline we show events like “{user} {created/viewed/edited} this {some_time_ago}”. If user is the current user, we used “You” instead of “Jon Doe”. This works in English, but in other languages it messes up the rest of the sentence.

Because of this, people added wrong translations of “You” that made the grammar work, but also made the message less clear.

Also, the _last viewed_ message used to link to **View Log**. That can be read by system managers only and doesn't hold additional information. So it's just a source of errors for users trying to click on it.

### Fixes

- don't mix up users and salutations. Always show user's full name.
- change the _last viewed_ message to work like the other two, remove link to **View Log**

### Demo

Logged an as Administrator:

English

![Bildschirmfoto 2022-06-30 um 15 28 37](https://user-images.githubusercontent.com/14891507/176689772-dd878c90-4a2c-4a32-aa6c-d2e14a6340e1.png)

German

![Bildschirmfoto 2022-06-30 um 15 28 03](https://user-images.githubusercontent.com/14891507/176689812-ce13bb31-6c70-40f2-8699-6fb0db1d06f9.png)

(cherry picked from commit f4fa4d3)

# Conflicts:
#	frappe/public/js/frappe/utils/utils.js
@mergify mergify bot requested a review from a team July 4, 2022 14:03
@mergify mergify bot added the conflicts label Jul 4, 2022
@mergify mergify bot requested review from surajshetty3416 and removed request for a team July 4, 2022 14:03
@shariquerik shariquerik merged commit 3f90b51 into version-13-hotfix Jul 4, 2022
@shariquerik shariquerik deleted the mergify/bp/version-13-hotfix/pr-17365 branch July 4, 2022 14:44
frappe-pr-bot pushed a commit that referenced this pull request Jul 5, 2022
# [13.35.0](v13.34.0...v13.35.0) (2022-07-05)

### Bug Fixes

* "You viewed/edited/created this" (backport [#17365](#17365)) ([#17402](#17402)) ([3f90b51](3f90b51))
* calendar view set in assign time ([6303a4e](6303a4e))
* don't try appending email to sent folder if enable incoming and imap is turned off ([#17344](#17344)) ([eba2a99](eba2a99))
* don't try appending email to sent folder if enable incoming and imap is turned off ([#17344](#17344)) ([524f9f2](524f9f2))
* email not sent if contain file with current site url (backport [#17250](#17250)) ([#17330](#17330)) ([32a5a6f](32a5a6f))
* enable further translations (backport [#17323](#17323)) ([#17340](#17340)) ([c8a58d4](c8a58d4))
* encode docname when routing ([c8777c5](c8777c5))
* extra notification triggered on value change (backport [#17364](#17364)) ([#17366](#17366)) ([eaf82dd](eaf82dd))
* german translations (backport [#17324](#17324)) ([#17341](#17341)) ([bd702ca](bd702ca))
* Issue sending email with attachement (that are not added by sending users) (fix in version-12 but not in version-13) ([#17293](#17293)) ([e44d4d9](e44d4d9))
* make language, source, translation mandatory (backport [#17396](#17396)) ([#17397](#17397)) ([652e9ef](652e9ef))
* **migrate:** Set touched_tables flag prior to try block ([b4d2d31](b4d2d31))
* **redis:** pass shared param when setting value based on generator (backport [#17322](#17322)) ([#17328](#17328)) ([410066c](410066c))
* refresh tree when the treeview is  loaded (backport [#17383](#17383)) ([#17401](#17401)) ([e2ef990](e2ef990))
* remove bare exceptions ([48d87bc](48d87bc))
* remove duplicate tracebacks (backport [#17385](#17385)) ([#17387](#17387)) ([bf91c91](bf91c91))
* remove spaces from email placeholders ([e427f51](e427f51))
* Replace new usages of placeholders ([c1f3e3f](c1f3e3f))
* Resolve conflicts ([dfec295](dfec295))
* Retain value in the field instance when field is rendered on a dialog w/o doc ([aa737bb](aa737bb))
* shortcut widget title overflowing ([#17399](#17399)) ([dff02cf](dff02cf))
* Skip invalid field in get_print_settings_to_show ([4beb66f](4beb66f))
* Translate strings in public folders too ([af9e402](af9e402))
* update ru translations ([#17404](#17404)) ([561fc51](561fc51))
* Use 'email_open_check' in template ([2237a17](2237a17))

### Features

* add email retry limit in system settings (backport [#17259](#17259)) ([#17336](#17336)) ([a87f156](a87f156))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.35.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 11, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants