-
Notifications
You must be signed in to change notification settings - Fork 904
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
fixed tooltip #4524
fixed tooltip #4524
Conversation
also closes #4446 |
config/locales/en-GB.yml
Outdated
@@ -1367,6 +1367,7 @@ en-GB: | |||
image size hint: (square images at least 100x100 work best) | |||
home location: Home Location | |||
no home location: You have not entered your home location. | |||
home location warning : This location will be revealed to other users. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You only need to edit config/locales/en.yml.
You wanted to say that it also closes #4507. But why didn't you make two pull requests instead? Those are different issues that don't depend on each other. |
config/locales/en.yml
Outdated
@@ -3095,7 +3095,7 @@ en: | |||
site: | |||
edit_tooltip: Edit the map | |||
edit_disabled_tooltip: Zoom in to edit the map | |||
createnote_tooltip: Add a note to the map | |||
createnote_tooltip: Move the marker and write a note to fix map errors. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You are writing about the marker in a tooltip that is shown before the marker is visible.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what should be written then?
As @AntonKhorev says these should be two separate PRs so please remove the second commit and submit it separately. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have made the required changes
@@ -2098,7 +2098,7 @@ en-GB: | |||
site: | |||
edit_tooltip: Edit the map | |||
edit_disabled_tooltip: Zoom in to edit the map | |||
createnote_tooltip: Add a note to the map | |||
createnote_tooltip: Add a note to the map. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please don't make changes to en-GB.yml
or any other locale file other than en.yml
as translations need to be done on Translatewiki not here.
@@ -3095,7 +3096,7 @@ en: | |||
site: | |||
edit_tooltip: Edit the map | |||
edit_disabled_tooltip: Zoom in to edit the map | |||
createnote_tooltip: Add a note to the map | |||
createnote_tooltip: Add a note to the map. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was correct as it was - none of the other tooltips have a full stop.
@@ -43,6 +43,9 @@ | |||
<fieldset> | |||
<legend><%= t ".home location" -%></legend> | |||
<p id="home_message" class="text-muted m-0<% if current_user.home_location? %> invisible<% end %>"><%= t ".no home location" %></p> | |||
<p class="text-muted m-0<% if current_user.home_location? %> invisible<% end %>"> | |||
<b><%= t(".home_location_warning") %></b> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change will no longer work as you've removed the home_location_warning
string from the locale file - you were asked to move this to a separate PR which would have required moving both this and the string but instead you just removed the string from this PR and left this.
ok I will open a new PR |
closes #4446