mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
about:startup - handle application brand name and localizable extension names correctly
This commit is contained in:
parent
479c0e8aeb
commit
e66665f40c
@ -5,16 +5,14 @@ let stringsvc = Components.classes["@mozilla.org/intl/stringbundle;1"]
|
||||
.getService(Components.interfaces.nsIStringBundleService);
|
||||
let strings = stringsvc.createBundle("chrome://global/locale/aboutStartup.properties");
|
||||
let branding = stringsvc.createBundle("chrome://branding/locale/brand.properties");
|
||||
let brandShortName = branding.GetStringFromName("brandShortName");
|
||||
|
||||
function displayTimestamp(id, µs) document.getElementById(id).textContent = formatstamp(µs);
|
||||
function displayDuration(id, µs) document.getElementById(id).nextSibling.textContent = formatms(msFromµs(µs));
|
||||
|
||||
function formatStr(str, args) strings.formatStringFromName("about.startup."+ str, args, args.length);
|
||||
function appVersion(version, build) formatStr("appVersion",
|
||||
[branding.getStringFromName("brandShortName"),
|
||||
// ["Firefox",
|
||||
version, build]);
|
||||
function formatExtension(str, id, version) formatStr("extension"+str, [id, version]);
|
||||
function appVersion(version, build) formatStr("appVersion", [brandShortName, version, build]);
|
||||
function formatExtension(str, name, version) formatStr("extension"+str, [name, version]);
|
||||
|
||||
function msFromµs(µs) µs / 1000;
|
||||
function formatstamp(µs) new Date(msFromµs(µs));
|
||||
@ -208,26 +206,30 @@ function populateEvents()
|
||||
query.executeAsync({
|
||||
handleResult: function(results)
|
||||
{
|
||||
let table = document.getElementById("events-table");
|
||||
for (let row = results.getNextRow(); row; row = results.getNextRow())
|
||||
Application.getExtensions(function (extensions)
|
||||
{
|
||||
hasresults = true;
|
||||
let stamp = row.getResultByName("timestamp"),
|
||||
id = row.getResultByName("id"),
|
||||
name = row.getResultByName("name"),
|
||||
version = row.getResultByName("version"),
|
||||
action = row.getResultByName("action");
|
||||
let table = document.getElementById("events-table");
|
||||
for (let row = results.getNextRow(); row; row = results.getNextRow())
|
||||
{
|
||||
hasresults = true;
|
||||
let stamp = row.getResultByName("timestamp"),
|
||||
id = row.getResultByName("id"),
|
||||
extension = extensions.get(id),
|
||||
name = extension ? extension.name : row.getResultByName("name"),
|
||||
version = row.getResultByName("version"),
|
||||
action = row.getResultByName("action");
|
||||
alert([id, name, row.getResultByName("name")].toSource());
|
||||
options.grid.markings.push(extensionMark(stamp, formatExtension(action, name, version)));
|
||||
|
||||
options.grid.markings.push(extensionMark(stamp, formatExtension(action, name, version)));
|
||||
|
||||
table.appendChild(tr(td(formatstamp(stamp)),
|
||||
td(action),
|
||||
td(name),
|
||||
td(id),
|
||||
td(version)));
|
||||
}
|
||||
if (hasresults)
|
||||
$("#events-table > .empty").hide();
|
||||
table.appendChild(tr(td(formatstamp(stamp)),
|
||||
td(action),
|
||||
td(name),
|
||||
td(id),
|
||||
td(version)));
|
||||
}
|
||||
if (hasresults)
|
||||
$("#events-table > .empty").hide();
|
||||
});
|
||||
},
|
||||
handleError: function(error)
|
||||
{
|
||||
|
@ -58,7 +58,7 @@
|
||||
<th>&about.startup.extensionID;</th>
|
||||
<th>&about.startup.version;</th>
|
||||
</tr>
|
||||
<tr class="empty"><td colspan="2"><i>&about.startup.noevents;</i></td></tr>
|
||||
<tr class="empty"><td colspan="5"><i>&about.startup.noevents;</i></td></tr>
|
||||
</table>
|
||||
</div>
|
||||
<script type="application/javascript;version=1.8" src="chrome://global/content/aboutStartup.js"/>
|
||||
|
@ -4,19 +4,19 @@
|
||||
about.startup.appVersion=%1$S %2$S (%3$S)
|
||||
# LOCALIZATION NOTE (about.startup.extensionInstalled): %1$S will be
|
||||
# the name of an extension, and %2$S will be its version number
|
||||
about.startup.extensionInstalled=%1$S %1$2 installed
|
||||
about.startup.extensionInstalled=%1$S %2$S installed
|
||||
# LOCALIZATION NOTE (about.startup.extensionUninstalled): %1$S will be
|
||||
# the name of an extension, and %2$S will be its version number
|
||||
about.startup.extensionUninstalled=%1$S %1$2 uninstalled
|
||||
about.startup.extensionUninstalled=%1$S %2$S uninstalled
|
||||
# LOCALIZATION NOTE (about.startup.extensionUpgraded): %1$S will be
|
||||
# the name of an extension, and %2$S will be its version number
|
||||
about.startup.extensionUpgraded=%1$S upgraded to %1$2
|
||||
about.startup.extensionUpgraded=%1$S upgraded to %2$S
|
||||
# LOCALIZATION NOTE (about.startup.extensionEnabled): %1$S will be the
|
||||
# name of an extension, and %2$S will be its version number
|
||||
about.startup.extensionEnabled=%1$S %1$2 enabled
|
||||
about.startup.extensionEnabled=%1$S %2$S enabled
|
||||
# LOCALIZATION NOTE (about.startup.extensionDisabled): %1$S will be
|
||||
# the name of an extension, and %2$S will be its version number
|
||||
about.startup.extensionDisabled=%1$S %1$2 disabled
|
||||
about.startup.extensionDisabled=%1$S %2$S disabled
|
||||
# LOCALIZATION NOTE (about.startup.milliseconds): formats a number
|
||||
# (%1$S) as milliseconds
|
||||
about.startup.milliseconds=%1$S ms
|
||||
|
Loading…
Reference in New Issue
Block a user