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

Fixes #3266 DRM string update #3304

Merged
merged 1 commit into from
May 1, 2020
Merged

Fixes #3266 DRM string update #3304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1393,7 +1393,7 @@ public void showFirstTimeDrmDialog(@NonNull Runnable callback) {
showConfirmPrompt(
R.drawable.ic_icon_drm_allowed,
getContext().getString(R.string.drm_first_use_title_v1),
getContext().getString(R.string.drm_first_use_body_v1, getResources().getString(R.string.sumo_drm_url)),
getContext().getString(R.string.drm_first_use_body_v2, getResources().getString(R.string.sumo_drm_url)),
new String[]{
getContext().getString(R.string.drm_first_use_do_not_allow),
getContext().getString(R.string.drm_first_use_allow),
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1608,7 +1608,7 @@ the Select` button. When clicked it closes all the previously selected tabs -->
<!-- This string is displayed as the body of a dialog that is displayed the first time a user access DRM content if they haven't
explicitly enable/Disable the DRM setting yet.
'%1$s' will be replaced at runtime with the Learn More page link. -->
<string name="drm_first_use_body_v1">Allowing DRM permits this site to identify this device every time you visit. &lt;a href="%1$s">Learn More&lt;/a></string>
<string name="drm_first_use_body_v2">Allowing DRM permits sites to identify this device every time you visit. &lt;a href="%1$s">Learn More&lt;/a></string>

<!-- This string is displayed in the enable button that is displayed inside the dialog that is displayed the first time a user access
access DRM content if they haven't explicitly enable/Disable the DRM setting yet. -->
Expand Down