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

Update terms in review page #156

Merged
merged 2 commits into from
Apr 7, 2023
Merged

Update terms in review page #156

merged 2 commits into from
Apr 7, 2023

Conversation

florelis
Copy link
Member

@florelis florelis commented Apr 6, 2023

Summary of the pull request

Update the terms and agreements in the review page per legal review

References and relevant issues

Detailed description of the pull request / Additional comments

  • Removed checkboxes to accept agreements and possibility of reboot
  • Added new text approved by legal only if installing an application, and a more specific string if installing from the MS Store.
  • Added a custom control to show a text block with an embedded hyperlink. This is intended to make it easier to localize the strings without having to concatenate multiple resource strings.

Validation steps performed

With app selected:
image

With app from the Store selected:
image

With no apps to install:
image

PR checklist

  • Closes #xxx
  • Tests added/passed
  • Documentation updated

@florelis
Copy link
Member Author

florelis commented Apr 6, 2023

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

/// Gets the task group from the corresponding type, if it exists in the current flow.
/// </summary>
#nullable enable
public T? GetTaskGroup<T>()
Copy link
Contributor

Choose a reason for hiding this comment

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

# Conflicts:
#	tools/SetupFlow/DevHome.SetupFlow/Views/ReviewView.xaml
@florelis
Copy link
Member Author

florelis commented Apr 7, 2023

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@florelis florelis merged commit b99d371 into microsoft:main Apr 7, 2023
@florelis florelis deleted the review branch April 7, 2023 03:24
@krschau
Copy link
Collaborator

krschau commented Apr 7, 2023

@florelis Didn't see this yesterday. When we have some time (before open sourcing), I'd suggest renaming the HyperlinkTextBlock user control. It's useful for a very specific purpose, and we don't want anyone to come along thinking this is the normal way to put hyperlinks in TextBlocks. It should probably have a more specific name.

@florelis
Copy link
Member Author

florelis commented Apr 7, 2023

@florelis Didn't see this yesterday. When we have some time (before open sourcing), I'd suggest renaming the HyperlinkTextBlock user control. It's useful for a very specific purpose, and we don't want anyone to come along thinking this is the normal way to put hyperlinks in TextBlocks. It should probably have a more specific name.

Sure, we can rename it. What name would you suggest?

Also, what would be a better or more normal way to put hyperlinks in TextBlocks? I probably should change it to that one.

@krschau
Copy link
Collaborator

krschau commented Apr 7, 2023

@florelis Sorry, I should have been more specific. What you do in HyperlinkTextBlock.xaml makes sense -- Runs and Hyperlinks to make up the TextBlock's contents. I'm just thinking of a total newbie coming in, not worrying about localization -- they don't need to create a custom control every time they want to put a hyperlink in a TextBlock.

Maybe something like "LocalizedTextBlockWithLink"?
Also, if you put it all on one line in the xaml markup (it's not that long) can you avoid using those comments, or does it still insert spaces?

But also, after poking around more, you're right! There does not seem to be a great way to solve this! I found a place in Settings where they deal with this, and they just make it three separate strings to translate. They must rely on the translators moving words around if the hyperlink part isn't at the end. Gets you out of needing a custom control, but more potential for translation error. I don't even see the translated versions in the source, so who knows. Your way is safer.
https://microsoft.visualstudio.com/DefaultCollection/OS/_git/0d54b6ef-7283-444f-847a-343728d58a4d?path=/shellcommon/shell/SystemSettings/desktop/HostApp/Resources/en-US/SystemSettings.resw&version=GBofficial/rs_we_adept&line=22785&lineEnd=22793&lineStartColumn=1&lineEndColumn=10&lineStyle=plain&_a=contents

I feel like I used to see this situation more. I wonder if they've leaned towards different designs because it is so awkward.

@florelis
Copy link
Member Author

florelis commented Apr 7, 2023

I'm just thinking of a total newbie coming in, not worrying about localization -- they don't need to create a custom control every time they want to put a hyperlink in a TextBlock.

Huh. I had never considered what could happen if a newbie used my code. Maybe I should be more careful.

Also, if you put it all on one line in the xaml markup (it's not that long) can you avoid using those comments, or does it still insert spaces?

I'm sure it would work putting it all in one line, but it seems harder to read and more likely to be messed with.

and they just make it three separate strings to translate. They must rely on the translators moving words around if the hyperlink part isn't at the end. Gets you out of needing a custom control, but more potential for translation error

Yeah... I was in a project that did that and it just felt mean to the translators lol
And translations already are awkward sometimes as is, without having to add in stuff like this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants