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.

Sign up for GitHub

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

Jump to bottom

Renamed Dialogue controls texts in the database #7243

Merged
merged 8 commits into from
Mar 3, 2022
Merged

Renamed Dialogue controls texts in the database #7243

merged 8 commits into from
Mar 3, 2022

Conversation

N-thony
Copy link
Collaborator

@N-thony N-thony commented Feb 17, 2022 •
edited by lloyddewit
Loading

Fixes (partially) #7073
@lloyddewit @shadrackkibet this just update the database by renaming the menu and dialogue text to View/Delete Labels for View Label dialogue.
image

@lloyddewit
Copy link
Contributor

@N-thony Thanks for the database update.
I assume the change to the translations table, fixes the specific issue but it has the side effect that 'View Labels...' will always be translated to 'View/Delete Labels...' for all controls . This may be confusing for future developers.
I suggest, that you reverse your current changes and instead:

  • translation table:
    • View/Delete Labels..., en, View/Delete Labels...
    • View/Delete Labels, en, View/Delete Labels
  • form_controls
    • for all affected controls, set the id text to 'View/Delete Labels' or 'View/Delete Labels...' as appropriate

Does that make sense?

Note: In your comment, I also changed 'Partially fixes` to 'Fixes (partially)', otherwise the issue will be closed automatically when this PR is merged.

@N-thony
Copy link
Collaborator Author

N-thony commented Feb 17, 2022

  • View/Delete Labels

@lloyddewit thanks, I made the requested changes.

@N-thony N-thony mentioned this pull request Feb 18, 2022
Closed
@N-thony
Copy link
Collaborator Author

N-thony commented Feb 18, 2022 •
edited
Loading

@lloyddewit I have the translation requested in #7244 here.
image

image

lloyddewit
lloyddewit requested changes Feb 22, 2022
View reviewed changes
Copy link
Contributor

@lloyddewit lloyddewit left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@N-thony The database changes look good, thanks.
One question: dlgFromLibrary files are changed, this will cause merge problems for PR #7244 . Are these changes needed?

@N-thony
Copy link
Collaborator Author

N-thony commented Feb 22, 2022

@N-thony The database changes look good, thanks. One question: dlgFromLibrary files are changed, this will cause merge problems for PR #7244 . Are these changes needed?

@lloyddewit yes.

lloyddewit
lloyddewit previously approved these changes Feb 28, 2022
View reviewed changes
Copy link
Contributor

@lloyddewit lloyddewit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@N-thony thanks, just one question, if you can resolve this, then I'll approve

instat/dlgFromLibrary.vb Outdated
@@ -326,4 +326,11 @@ Public Class dlgFromLibrary
End If
End Sub

Private Sub ucrInputPackages_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputPackages.ControlValueChanged
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are these functions needed? is it possible to undo the changes to this file?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lloyddewit I have removed this, take a look. Thanks.

@N-thony N-thony changed the title Renamed View Labels Dialogue in the database Renamed Dialogue controls texts in the database Mar 2, 2022
@N-thony
Copy link
Collaborator Author

N-thony commented Mar 2, 2022

I added the change requested in #7253 here
image
Also from #7025
image
image

lloyddewit
lloyddewit requested changes Mar 2, 2022
View reviewed changes
instat/dlgFromLibrary.vb Outdated Show resolved Hide resolved
lloyddewit
lloyddewit previously approved these changes Mar 2, 2022
View reviewed changes
@lloyddewit
Copy link
Contributor

@N-thony Thank you, happy to approve
@shadrackkibet @rdstern I understand that this PR:

Please could one of you test/approve?
Thanks!

@N-thony
Copy link
Collaborator Author

N-thony commented Mar 2, 2022

@lloyddewit after the quick discussion with Shadrack, the Label no preview on the Import dataset dialogue should remain as it was. I have reverted the change in the database
image

@Vitalis95 Vitalis95 mentioned this pull request Mar 3, 2022
Merged
@lloyddewit
Copy link
Contributor

I approved the latest change above.
@shadrackkibet @rdstern I understand that this PR:

Please could one of you test/approve?
Thanks!

@lloyddewit lloyddewit mentioned this pull request Mar 3, 2022
Merged
@shadrackkibet shadrackkibet merged commit c2aa944 into IDEMSInternational:master Mar 3, 2022
@shadrackkibet shadrackkibet added the skip-releasenotes PRs that don't affect functionality and should not be included in the release notes label Mar 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lloyddewit lloyddewit lloyddewit approved these changes

@shadrackkibet shadrackkibet shadrackkibet approved these changes

Assignees
No one assigned
Labels
skip-releasenotes PRs that don't affect functionality and should not be included in the release notes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@N-thony @lloyddewit @shadrackkibet