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

[Fix] Misleading update tooltip #575 #627

Closed
wants to merge 4 commits into from
+900 −558
Closed

[Fix] Misleading update tooltip #575 #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
552b8e0
Add extra grid view tab #614
VladimirPozdnyakov Jan 14, 2025
5347821
Fix lint.
VladimirPozdnyakov Jan 14, 2025
f6c2bbc
Update grid view tab with SVG icon in manage.html for extra grid view…
VladimirPozdnyakov Jan 14, 2025
d179291
Misleading update tooltip #575
VladimirPozdnyakov Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 9 additions & 40 deletions extension/src/_locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
// Extension Properties

"appName": {
"message": "Progressive Web Apps for Firefox",
"description": "The name of the application, should not be translated"
Expand All @@ -13,9 +12,7 @@
"message": "A tool to install, manage and use Progressive Web Apps (PWAs) in Mozilla Firefox",
"description": "The description of the application"
},

// Extension Actions

"actionInstallSite": {
"message": "Install this site",
"description": "Instruct users that they can install the current site here"
Expand All @@ -24,9 +21,7 @@
"message": "Launch this site",
"description": "Instruct users that they can launch the current site here"
},

// Update Notification

"updateNotificationTitle": {
"message": "PWAsForFirefox Update",
"description": "The title of the update notification, displayed when an update is available"
Expand All @@ -35,9 +30,7 @@
"message": "A PWAsForFirefox update is available. Please click the notification to display the update instructions.",
"description": "The message of the update notification, displayed when an update is available"
},

// Common Messages

"commonError": {
"message": "Error",
"description": "Displayed before error messages or as a popup title"
Expand Down Expand Up @@ -86,9 +79,7 @@
"message": "Firefox version:",
"description": "Displayed before the main browser version"
},

// Web App Properties

"webAppName": {
"message": "Name",
"description": "The name property of a web app"
Expand Down Expand Up @@ -125,9 +116,7 @@
"message": "Protocol Handlers",
"description": "The protocol handlers property of a web app"
},

// Profile Properties

"profileName": {
"message": "Name",
"description": "The name property of a profile"
Expand All @@ -148,9 +137,7 @@
"message": "ID",
"description": "The ID property of a profile"
},

// Web App Validation

"webAppValidationNameReuse": {
"message": "Name cannot be reused from existing web apps",
"description": "A validation error when the web app name is reused"
Expand All @@ -171,9 +158,7 @@
"message": "Only one instance per profile can be installed",
"description": "A validation error when multiple web app instances are tried to be installed in the same profile"
},

// Setup Page

"setupPageTitle": {
"message": "Setup Progressive Web Apps for Firefox",
"description": "The title of the setup page"
Expand Down Expand Up @@ -346,9 +331,7 @@
"message": "This extension is now ready to be used. You can close this page.",
"description": "The ready notice on the setup page"
},

// Update Page

"updatePageTitle": {
"message": "Update Progressive Web Apps for Firefox",
"description": "The title of the update page"
Expand Down Expand Up @@ -397,9 +380,7 @@
"message": "This update <strong>may contain backward-incompatible changes</strong>, so you may also need to re-configure some things as specified in the release notes to make it work.",
"description": "Displayed on the update page when an update contains potential backward-incompatible changes"
},

// Installation Instructions Page

"instructionsPageTitle": {
"message": "Installation Instructions",
"description": "The title of the installation instructions page"
Expand Down Expand Up @@ -680,9 +661,7 @@
"message": "Your operating system is not officially supported. You can try building and installing the project from source with instructions from the source installation section. You may need to adjust them to make it work with your operating system, and there is no guarantee that it will work.",
"description": "The notice for the other installation option"
},

// Install Page

"installPageTitle": {
"message": "Install this web app",
"description": "The title of the install web app page"
Expand Down Expand Up @@ -727,9 +706,7 @@
"message": "Some <a href=\"https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Content_scripts\" target=\"_blank\">Mozilla websites</a> are restricted for extensions. This is a Firefox security feature and cannot be disabled. Restricted websites cannot be installed as web apps.",
"description": "A message that extends the content script error with more details when used on restricted domains"
},

// Launch Page

"launchPageTitle": {
"message": "Launch this web app",
"description": "The title of the launch web app page"
Expand All @@ -738,9 +715,7 @@
"message": "Install a new instance",
"description": "Displayed on the launch web app page to install a new instance"
},

// Manage Page

"managePageTitle": {
"message": "Manage web apps and profiles",
"description": "The title of the manage page"
Expand All @@ -757,7 +732,6 @@
"message": "Settings",
"description": "The settings tab on the manage page"
},

"managePageAppListIcon": {
"message": "Icon",
"description": "The icon alternative text on the web app list"
Expand All @@ -782,7 +756,6 @@
"message": "Install current site",
"description": "A button that is displayed on the web app list to install the current site"
},

"managePageProfileListCreate": {
"message": "Create profile",
"description": "The create tooltip on the profile list and the title of the edit profile dialog"
Expand Down Expand Up @@ -811,7 +784,6 @@
"message": "{count, plural, one {# app} other {# apps}}",
"description": "The web app count in the profile, supports limited pluralization options"
},

"managePageSettingsDisplayPageAction": {
"message": "Display address bar widget",
"description": "The setting for displaying page action (address bar widget)"
Expand Down Expand Up @@ -896,20 +868,26 @@
"message": "About the project",
"description": "The button in settings to display project info"
},

"managePageFooterOutdated1": {
"message": "The extension is outdated!",
"description": "The first part of the extension outdated warning"
},
"managePageFooterNativeOutdated1": {
"message": "The native connector is outdated!",
"description": "The first part of the native connector outdated warning"
},
"managePageFooterOutdated2": {
"message": "Please update it!",
"description": "The second part of the extension outdated warning"
},
"managePageFooterNativeOutdated2": {
"message": "Please update it!",
"description": "The second part of the native connector outdated warning"
},
"managePageFooterSearchPlaceholder": {
"message": "Search by name",
"description": "The search placeholder for web apps and profiles"
},

"managePageAppEditLaunchOnWebsiteLabel": {
"message": "Launch this web app on matching website",
"description": "The label for the launch on website checkbox on the edit web app dialog"
Expand Down Expand Up @@ -950,7 +928,6 @@
"message": "Determines if icons will be updated when you edit this web app",
"description": "The tooltip for the icons update checkbox on the edit web app dialog"
},

"managePageAppRemoveQuestion": {
"message": "Are you sure you want to remove this web app?",
"description": "The confirmation question on the remove web app dialog"
Expand All @@ -971,12 +948,10 @@
"message": "Determines if the current app profile and data will be deleted while uninstalling the app",
"description": "The label for the profile delete checkbox on the remove web app dialog"
},

"managePageProfileEditApplyProfileLabel": {
"message": "Apply the profile template",
"description": "The label for the apply template checkbox on the edit profile dialog"
},

"managePageProfileRemoveQuestion": {
"message": "Are you sure you want to remove this profile? This will completely remove the profile and all associated web apps, including their data. You might not be able to fully recover this action.",
"description": "The confirmation question on the remove profile dialog"
Expand All @@ -985,7 +960,6 @@
"message": "Default profile cannot be completely removed. Web apps and data will be cleared, but the profile will stay.",
"description": "The additional clarification on the remove profile dialog if this is the default profile"
},

"managePageAutoLaunchTitle": {
"message": "Automatic web app launching",
"description": "The title of the automatic launching dialog"
Expand All @@ -1012,7 +986,6 @@
"message": "Enable",
"description": "The enable button for the automatic launching"
},

"managePageUpdateWebAppsAbout1": {
"message": "This will download and parse manifests for all your web apps and register them again to the operating systems. Any changes in web app manifests will also be reflected on your system.",
"description": "The first part of about updating web apps message"
Expand All @@ -1025,7 +998,6 @@
"message": "Perform manifest updates",
"description": "The checkbox label for performing manifest updates when updating web apps"
},

"managePagePatchProfilesAbout1": {
"message": "This will patch all profiles and runtime with the current globally installed version.",
"description": "The first part of about patching profiles and runtime message"
Expand All @@ -1042,7 +1014,6 @@
"message": "Patch profiles",
"description": "The checkbox label for patching profiles when patching profiles and runtime"
},

"managePageReinstallRuntimeAbout1": {
"message": "Are you sure you want to reinstall the PWAsForFirefox runtime? This will remove your current runtime and download the latest version from Mozilla.",
"description": "The first part of about reinstalling runtime message"
Expand All @@ -1051,9 +1022,7 @@
"message": "This will <strong>not</strong> affect your main Firefox browser and will <strong>not</strong> remove any profiles or other data.",
"description": "The second part of about reinstalling runtime message"
},

// Buttons

"buttonRuntimeInstallDefault": {
"message": "Install the runtime",
"description": "The runtime installation button on the setup page, allowing the user to install the runtime"
Expand Down Expand Up @@ -1150,4 +1119,4 @@
"message": "Reinstalled!",
"description": "The reinstall button, after something (runtime) has been reinstalled"
}
}
}
111 changes: 59 additions & 52 deletions extension/src/setup/update.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,67 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title data-i18n="updatePageTitle"></title>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no" />
<link rel="shortcut icon" type="image/png" href="../images/addon-logo.svg" />
<link rel="stylesheet" href="update.scss" />
</head>

<body class="bg-body-tertiary">
<div class="container-fluid vh-100">
<div class="row justify-content-center">
<div class="wrapper my-4 px-4 py-0">
<div class="card px-0 pt-4 pb-0 mt-3 mb-3">
<h1 class="text-center pb-2" data-i18n="updatePageTitle"></h1>
<div class="row">
<div class="pb-3">
<p id="native-not-updated" class="px-3 d-none">
<span data-i18n="updatePageNativeOutdated"></span>
<span id="native-versions-compatible" data-i18n="updatePageNativeCompatible" class="d-none"></span>
<span id="native-versions-incompatible" data-i18n="updatePageNativeIncompatible" class="d-none"></span>
<span data-i18n="updatePageNativeInstructions"></span>
</p>

<p id="extension-not-updated" class="px-3 d-none">
<span data-i18n="updatePageExtensionOutdated"></span>
<span id="extension-versions-compatible" data-i18n="updatePageExtensionCompatible" class="d-none"></span>
<span id="extension-versions-incompatible" data-i18n="updatePageExtensionIncompatible" class="d-none"></span>
<span data-i18n="updatePageExtensionInstructions"></span>
</p>

<p id="both-updated" data-i18n="updatePageUpdated" class="px-3 d-none"></p>

<p id="release-notes-show" class="px-3 d-none">
<span data-i18n="updatePageReleaseNotes"></span>
<span id="release-notes-incompatible" data-i18n="updatePageReleaseNotesIncompatible" class="d-none"></span>
</p>

<p id="native-error" class="px-3 d-none">
<strong><span data-i18n="commonError"></span>:</strong>
<span id="native-error-text"></span>
</p>

<ul class="px-3 list-unstyled">
<li><strong data-i18n="commonExtensionVersion"></strong> <span id="version-extension"><em data-i18n="commonLoading"></em></span></li>
<li><strong data-i18n="commonNativeVersion"></strong> <span id="version-native"><em data-i18n="commonLoading"></em></span></li>
</ul>

<iframe class="px-3 d-none" id="connector-instructions" src="instructions.html"></iframe>
</div>

<head>
<title data-i18n="updatePageTitle"></title>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no" />
<link rel="shortcut icon" type="image/png" href="../images/addon-logo.svg" />
<link rel="stylesheet" href="update.scss" />
</head>

<body class="bg-body-tertiary">
<div class="container-fluid vh-100">
<div class="row justify-content-center">
<div class="wrapper my-4 px-4 py-0">
<div class="card px-0 pt-4 pb-0 mt-3 mb-3">
<h1 class="text-center pb-2" data-i18n="updatePageTitle"></h1>
<div class="row">
<div class="pb-3">
<p id="native-not-updated" class="px-3 d-none">
<span data-i18n="updatePageNativeOutdated"></span>
<span id="native-versions-compatible" data-i18n="updatePageNativeCompatible" class="d-none"></span>
<span id="native-versions-incompatible" data-i18n="updatePageNativeIncompatible" class="d-none"></span>
<span data-i18n="updatePageNativeInstructions"></span>
</p>

<p id="extension-not-updated" class="px-3 d-none">
<span data-i18n="updatePageExtensionOutdated"></span>
<span id="extension-versions-compatible" data-i18n="updatePageExtensionCompatible"
class="d-none"></span>
<span id="extension-versions-incompatible" data-i18n="updatePageExtensionIncompatible"
class="d-none"></span>
<span data-i18n="updatePageExtensionInstructions"></span>
</p>

<p id="both-updated" data-i18n="updatePageUpdated" class="px-3 d-none"></p>

<p id="release-notes-show" class="px-3 d-none">
<span data-i18n="updatePageReleaseNotes"></span>
<span id="release-notes-incompatible" data-i18n="updatePageReleaseNotesIncompatible"
class="d-none"></span>
</p>

<p id="native-error" class="px-3 d-none">
<strong><span data-i18n="commonError"></span>:</strong>
<span id="native-error-text"></span>
</p>

<ul class="px-3 list-unstyled">
<li><strong data-i18n="commonExtensionVersion"></strong> <span id="version-extension"><em
data-i18n="commonLoading"></em></span></li>
<li><strong data-i18n="commonNativeVersion"></strong> <span id="version-native"><em
data-i18n="commonLoading"></em></span></li>
</ul>

<iframe class="px-3 d-none" id="connector-instructions" src="instructions.html"></iframe>
</div>
</div>
</div>
</div>
</div>
</div>

<script type="module" src="update.js"></script>
</body>

<script type="module" src="update.js"></script>
</body>
</html>
</html>
Loading
Loading