mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

bug 163350 - Cookie confirmation dialog could use better wording, r=timeless, sr=jag, checking in for mvl@exedo.nl

This commit is contained in:
kairo%kairo.at 2003-02-22 13:42:15 +00:00
Родитель 6f5eec3c1e
Коммит ed5092614a
10 изменённых файлов: 271 добавлений и 157 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

28
extensions/cookie/resources/content/cookieAcceptDialog.js
Просмотреть файл

@ -47,9 +47,12 @@ var hideDetails = "";
function onload()
{
doSetOKCancel(cookieAccept);
var dialog = document.documentElement;
dialog.getButton("accept").label = dialog.getAttribute("acceptLabel");
dialog.getButton("cancel").label = dialog.getAttribute("cancelLabel");
document.getElementById("ok").label = dialog.getAttribute("acceptLabel");
document.getElementById("cancel").label = dialog.getAttribute("cancelLabel");
if (!gDateService) {
const nsScriptableDateFormat_CONTRACTID = "@mozilla.org/intl/scriptabledateformat;1";
@ -63,15 +66,19 @@ function onload()
//cache strings
if (!showDetails) {
showDetails = cookieBundle.getString('showDetails');
showDetailsAccessKey = cookieBundle.getString('showDetailsAccessKey');
}
if (!hideDetails) {
hideDetails = cookieBundle.getString('hideDetails');
hideDetailsAccessKey = cookieBundle.getString('hideDetailsAccessKey');
}
if (document.getElementById('infobox').hidden) {
document.getElementById('disclosureButton').setAttribute("label",showDetails);
document.getElementById('disclosureButton').setAttribute("accesskey",showDetailsAccessKey);
} else {
document.getElementById('disclosureButton').setAttribute("label",hideDetails);
document.getElementById('disclosureButton').setAttribute("accesskey",hideDetailsAccessKey);
}
if ("arguments" in window && window.arguments.length >= 1 && window.arguments[0]) {
@ -102,12 +109,17 @@ function onload()
// to not make the mess worse.
messageText = cookieBundle.getFormattedString(messageFormat,["",cookiesFromHost]);
var messageParent = document.getElementById("info.box");
var messageParent = document.getElementById("dialogtextbox");
var messageParagraphs = messageText.split("\n");
for (var i = 0; i < messageParagraphs.length; i++) {
// use value for the header, so it doesn't wrap.
var headerNode = document.getElementById("dialog-header");
headerNode.setAttribute("value",messageParagraphs[0]);
// use childnodes here, the tekst can wrap
for (var i = 1; i < messageParagraphs.length; i++) {
var descriptionNode = document.createElement("description");
var text = document.createTextNode(messageParagraphs[i]);
text = document.createTextNode(messageParagraphs[i]);
descriptionNode.appendChild(text);
messageParent.appendChild(descriptionNode);
}
@ -143,9 +155,11 @@ function showhideinfo()
if (infobox.hidden) {
infobox.setAttribute("hidden","false");
document.getElementById('disclosureButton').setAttribute("label",hideDetails);
document.getElementById('disclosureButton').setAttribute("accesskey",hideDetailsAccessKey);
} else {
infobox.setAttribute("hidden","true");
document.getElementById('disclosureButton').setAttribute("label",showDetails);
document.getElementById('disclosureButton').setAttribute("accesskey",showDetailsAccessKey);
}
sizeToContent();
}
@ -157,7 +171,9 @@ function onChangePersitence()
function cookieAccept()
{
params.SetInt(nsICookieAcceptDialog.ACCEPT_COOKIE, 1); // say that ok was pressed
// say that the cookie was accepted
params.SetInt(nsICookieAcceptDialog.ACCEPT_COOKIE, 1);
window.close();
}
function GetExpiresString(secondsUntilExpires) {

138
extensions/cookie/resources/content/cookieAcceptDialog.xul
Просмотреть файл

@ -40,84 +40,110 @@
<!DOCTYPE dialog SYSTEM "chrome://cookie/locale/cookieAcceptDialog.dtd">
<!-- use a overlay te be able to put the accept/deny buttons not on the bottom -->
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<!-- use buttons="disclosure" to hide ok/cancel buttons. Those are added manually later -->
<dialog id="cookieAcceptDialog"
acceptLabel="&button.yes.label;"
cancelLabel="&button.no.label;"
acceptLabel="&button.allow.label;"
cancelLabel="&button.deny.label;"
onload="onload();"
ondialogaccept="return cookieAccept();"
ondialogaccept="return doOKButton();"
title="&dialog.title;"
buttons="disclosure"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<?xml-stylesheet src="chrome://global/skin/dialog.css" type="text/css"?>
<script src="cookieAcceptDialog.js" type="application/x-javascript"/>
<stringbundle id="cookieBundle"
src="chrome://cookie/locale/cookieAcceptDialog.properties"/>
<hbox>
<hbox align="start">
<image id="info.icon" class="spaced" src="chrome://global/skin/icons/alert-exclam.gif"/>
</hbox>
<vbox>
<vbox>
<vbox flex="1">
<!-- text -->
<vbox id="info.box"/>
<hbox id="checkboxContainer">
<checkbox id="persistDomainAcceptance" oncommand="onChangePersitence();" label="&button.rememberdecision.label;"/>
</hbox>
<vbox>
<hbox>
<hbox align="start">
<image id="infoicon" class="spaced alert-icon"/>
</hbox>
<vbox flex="1">
<!-- text -->
<vbox id="dialogtextbox">
<description id="dialog-header" class="header"/>
</vbox>
<hbox pack="start">
<button id="disclosureButton" dlgtype="disclosure" class="dialog-button"
oncommand="showhideinfo();"/>
<hbox id="checkboxContainer">
<checkbox id="persistDomainAcceptance" oncommand="onChangePersitence();"
label="&dialog.remember.label;" accesskey="&dialog.remember.accesskey;"/>
</hbox>
</vbox>
<groupbox id="infobox" hidden="true" persist="hidden" flex="1">
<caption label="&props.box.label;"/>
<grid flex="1">
<columns>
<column align="end"/>
<column flex="1"/>
</columns>
<rows>
<row align="center">
</hbox>
<hbox>
<button id="disclosureButton" dlgtype="disclosure" class="exit-dialog"
oncommand="showhideinfo();"/>
<spacer flex="1"/>
<hbox id="okCancelButtonsRight"/>
</hbox>
<vbox id="infobox" hidden="true" persist="hidden">
<separator class="groove"/>
<grid flex="1">
<columns>
<column/>
<column flex="1"/>
</columns>
<rows>
<row align="center">
<hbox align="center" pack="end">
<label value="&props.name.label;"/>
<textbox id="ifl_name" readonly="true"/>
</row>
<row align="center">
</hbox>
<textbox id="ifl_name" readonly="true" class="plain"/>
</row>
<row align="center">
<hbox align="center" pack="end">
<label value="&props.value.label;"/>
<textbox id="ifl_value" readonly="true"/>
</row>
<row align="center">
</hbox>
<textbox id="ifl_value" readonly="true" class="plain"/>
</row>
<row align="center">
<hbox align="center" pack="end">
<label id="ifl_isDomain" value="&props.domain.label;"/>
<textbox id="ifl_host" readonly="true"/>
</row>
<row align="center">
</hbox>
<textbox id="ifl_host" readonly="true" class="plain"/>
</row>
<row align="center">
<hbox align="center" pack="end">
<label value="&props.path.label;"/>
<textbox id="ifl_path" readonly="true"/>
</row>
<row align="center">
</hbox>
<textbox id="ifl_path" readonly="true" class="plain"/>
</row>
<row align="center">
<hbox align="center" pack="end">
<label value="&props.secure.label;"/>
<textbox id="ifl_isSecure" readonly="true"/>
</row>
<row align="center">
</hbox>
<textbox id="ifl_isSecure" readonly="true" class="plain"/>
</row>
<row align="center">
<hbox align="center" pack="end">
<label value="&props.expires.label;"/>
<textbox id="ifl_expires" readonly="true"/>
</row>
<row align="center" id="policyField" hidden="true">
</hbox>
<textbox id="ifl_expires" readonly="true" class="plain"/>
</row>
<row align="center" id="policyField" hidden="true">
<hbox align="center" pack="end">
<label value="&props.policy.label;"/>
<textbox id="ifl_policy" readonly="true"/>
</row>
</rows>
</grid>
</groupbox>
</hbox>
<textbox id="ifl_policy" readonly="true" class="plain"/>
</row>
</rows>
</grid>
</vbox>
</hbox>
</vbox>
</dialog>

9
extensions/cookie/resources/locale/en-US/cookieAcceptDialog.dtd
Просмотреть файл

@ -1,14 +1,15 @@
<!ENTITY props.box.label "About this cookie">
<!ENTITY props.name.label "Name:">
<!ENTITY props.value.label "Information:">
<!ENTITY props.value.label "Content:">
<!ENTITY props.domain.label "Host:">
<!ENTITY props.path.label "Path:">
<!ENTITY props.secure.label "Server Secure:">
<!ENTITY props.expires.label "Expires:">
<!ENTITY props.policy.label "Policy:">
<!ENTITY button.rememberdecision.label "Remember this decision">
<!ENTITY button.yes.label "Yes">
<!ENTITY button.no.label "No">
<!ENTITY button.allow.label "Allow">
<!ENTITY button.deny.label "Deny">
<!ENTITY dialog.title "Confirm">
<!ENTITY dialog.remember.label "Use my choice for all cookies from this site">
<!ENTITY dialog.remember.accesskey "U">

13
extensions/cookie/resources/locale/en-US/cookieAcceptDialog.properties
Просмотреть файл

@ -7,10 +7,13 @@ atEndOfSession=at end of session
showDetails=Show Details
hideDetails=Hide Details
permissionToSetACookie = The site %S wants to set a cookie. Do you want to allow it?
permissionToSetSecondCookie = The site %S wants to set a second cookie. Do you want to allow it?
showDetailsAccessKey = S
hideDetailsAccessKey = H
permissionToSetACookie = The site %S wants to set a cookie.
permissionToSetSecondCookie = The site %S wants to set a second cookie.
# LOCALIZATION NOTE (PermissionToSetAnotherCookie): First %S: sitename, second %S: number of cookies already present for that site
permissionToSetAnotherCookie = The site %S wants permission to set another cookie. You already have %S cookies from this site. Do you want to allow it?
permissionToModifyCookie = The site %S wants to modify an existing cookie. Do you want to allow it?
permissionToAcceptImage = The site %S wants to load an image. Do you want to allow it?
permissionToSetAnotherCookie = The site %S wants permission to set another cookie.\nYou already have %S cookies from this site.
permissionToModifyCookie = The site %S wants to modify an existing cookie.
permissionToAcceptImage = The site %S wants to load an image.
rememberThisDecision = Remember this decision

2
extensions/wallet/cookieviewer/CookieViewer.dtd
Просмотреть файл

@ -10,7 +10,7 @@
<!ENTITY button.removeallcookies.label "Remove All Cookies">
<!ENTITY props.name.label "Name:">
<!ENTITY props.value.label "Information:">
<!ENTITY props.value.label "Content:">
<!ENTITY props.domain.label "Host:">
<!ENTITY props.path.label "Path:">
<!ENTITY props.secure.label "Server Secure:">

50
extensions/wallet/cookieviewer/CookieViewer.xul
Просмотреть файл

@ -80,34 +80,56 @@
<column flex="1"/>
</columns>
<rows>
<row align="center">
<label value="&props.name.label;"/>
<textbox id="ifl_name" readonly="true"/>
<hbox align="center" pack="end">
<label value="&props.name.label;"/>
</hbox>
<textbox id="ifl_name" readonly="true" class="plain"/>
</row>
<row align="center">
<label value="&props.value.label;"/>
<textbox id="ifl_value" readonly="true"/>
<hbox align="center" pack="end">
<label value="&props.value.label;"/>
</hbox>
<textbox id="ifl_value" readonly="true" class="plain"/>
</row>
<row align="center">
<label id="ifl_isDomain" value="&props.domain.label;"/>
<textbox id="ifl_host" readonly="true"/>
<hbox align="center" pack="end">
<label id="ifl_isDomain" value="&props.domain.label;"/>
</hbox>
<textbox id="ifl_host" readonly="true" class="plain"/>
</row>
<row align="center">
<label value="&props.path.label;"/>
<textbox id="ifl_path" readonly="true"/>
<hbox align="center" pack="end">
<label value="&props.path.label;"/>
</hbox>
<textbox id="ifl_path" readonly="true" class="plain"/>
</row>
<row align="center">
<label value="&props.secure.label;"/>
<textbox id="ifl_isSecure" readonly="true"/>
<hbox align="center" pack="end">
<label value="&props.secure.label;"/>
</hbox>
<textbox id="ifl_isSecure" readonly="true" class="plain"/>
</row>
<row align="center">
<label value="&props.expires.label;"/>
<textbox id="ifl_expires" readonly="true"/>
<hbox align="center" pack="end">
<label value="&props.expires.label;"/>
</hbox>
<textbox id="ifl_expires" readonly="true" class="plain"/>
</row>
<row align="center" id="policyField" hidden="true">
<label value="&props.policy.label;"/>
<textbox id="ifl_policy" readonly="true"/>
<hbox align="center" pack="end">
<label value="&props.policy.label;"/>
</hbox>
<textbox id="ifl_policy" readonly="true" class="plain"/>
</row>
</rows>
</grid>
</groupbox>

28
toolkit/components/cookie/content/cookieAcceptDialog.js
Просмотреть файл

@ -47,9 +47,12 @@ var hideDetails = "";
function onload()
{
doSetOKCancel(cookieAccept);
var dialog = document.documentElement;
dialog.getButton("accept").label = dialog.getAttribute("acceptLabel");
dialog.getButton("cancel").label = dialog.getAttribute("cancelLabel");
document.getElementById("ok").label = dialog.getAttribute("acceptLabel");
document.getElementById("cancel").label = dialog.getAttribute("cancelLabel");
if (!gDateService) {
const nsScriptableDateFormat_CONTRACTID = "@mozilla.org/intl/scriptabledateformat;1";
@ -63,15 +66,19 @@ function onload()
//cache strings
if (!showDetails) {
showDetails = cookieBundle.getString('showDetails');
showDetailsAccessKey = cookieBundle.getString('showDetailsAccessKey');
}
if (!hideDetails) {
hideDetails = cookieBundle.getString('hideDetails');
hideDetailsAccessKey = cookieBundle.getString('hideDetailsAccessKey');
}
if (document.getElementById('infobox').hidden) {
document.getElementById('disclosureButton').setAttribute("label",showDetails);
document.getElementById('disclosureButton').setAttribute("accesskey",showDetailsAccessKey);
} else {
document.getElementById('disclosureButton').setAttribute("label",hideDetails);
document.getElementById('disclosureButton').setAttribute("accesskey",hideDetailsAccessKey);
}
if ("arguments" in window && window.arguments.length >= 1 && window.arguments[0]) {
@ -102,12 +109,17 @@ function onload()
// to not make the mess worse.
messageText = cookieBundle.getFormattedString(messageFormat,["",cookiesFromHost]);
var messageParent = document.getElementById("info.box");
var messageParent = document.getElementById("dialogtextbox");
var messageParagraphs = messageText.split("\n");
for (var i = 0; i < messageParagraphs.length; i++) {
// use value for the header, so it doesn't wrap.
var headerNode = document.getElementById("dialog-header");
headerNode.setAttribute("value",messageParagraphs[0]);
// use childnodes here, the tekst can wrap
for (var i = 1; i < messageParagraphs.length; i++) {
var descriptionNode = document.createElement("description");
var text = document.createTextNode(messageParagraphs[i]);
text = document.createTextNode(messageParagraphs[i]);
descriptionNode.appendChild(text);
messageParent.appendChild(descriptionNode);
}
@ -143,9 +155,11 @@ function showhideinfo()
if (infobox.hidden) {
infobox.setAttribute("hidden","false");
document.getElementById('disclosureButton').setAttribute("label",hideDetails);
document.getElementById('disclosureButton').setAttribute("accesskey",hideDetailsAccessKey);
} else {
infobox.setAttribute("hidden","true");
document.getElementById('disclosureButton').setAttribute("label",showDetails);
document.getElementById('disclosureButton').setAttribute("accesskey",showDetailsAccessKey);
}
sizeToContent();
}
@ -157,7 +171,9 @@ function onChangePersitence()
function cookieAccept()
{
params.SetInt(nsICookieAcceptDialog.ACCEPT_COOKIE, 1); // say that ok was pressed
// say that the cookie was accepted
params.SetInt(nsICookieAcceptDialog.ACCEPT_COOKIE, 1);
window.close();
}
function GetExpiresString(secondsUntilExpires) {

138
toolkit/components/cookie/content/cookieAcceptDialog.xul
Просмотреть файл

@ -40,84 +40,110 @@
<!DOCTYPE dialog SYSTEM "chrome://cookie/locale/cookieAcceptDialog.dtd">
<!-- use a overlay te be able to put the accept/deny buttons not on the bottom -->
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<!-- use buttons="disclosure" to hide ok/cancel buttons. Those are added manually later -->
<dialog id="cookieAcceptDialog"
acceptLabel="&button.yes.label;"
cancelLabel="&button.no.label;"
acceptLabel="&button.allow.label;"
cancelLabel="&button.deny.label;"
onload="onload();"
ondialogaccept="return cookieAccept();"
ondialogaccept="return doOKButton();"
title="&dialog.title;"
buttons="disclosure"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<?xml-stylesheet src="chrome://global/skin/dialog.css" type="text/css"?>
<script src="cookieAcceptDialog.js" type="application/x-javascript"/>
<stringbundle id="cookieBundle"
src="chrome://cookie/locale/cookieAcceptDialog.properties"/>
<hbox>
<hbox align="start">
<image id="info.icon" class="spaced" src="chrome://global/skin/icons/alert-exclam.gif"/>
</hbox>
<vbox>
<vbox>
<vbox flex="1">
<!-- text -->
<vbox id="info.box"/>
<hbox id="checkboxContainer">
<checkbox id="persistDomainAcceptance" oncommand="onChangePersitence();" label="&button.rememberdecision.label;"/>
</hbox>
<vbox>
<hbox>
<hbox align="start">
<image id="infoicon" class="spaced alert-icon"/>
</hbox>
<vbox flex="1">
<!-- text -->
<vbox id="dialogtextbox">
<description id="dialog-header" class="header"/>
</vbox>
<hbox pack="start">
<button id="disclosureButton" dlgtype="disclosure" class="dialog-button"
oncommand="showhideinfo();"/>
<hbox id="checkboxContainer">
<checkbox id="persistDomainAcceptance" oncommand="onChangePersitence();"
label="&dialog.remember.label;" accesskey="&dialog.remember.accesskey;"/>
</hbox>
</vbox>
<groupbox id="infobox" hidden="true" persist="hidden" flex="1">
<caption label="&props.box.label;"/>
<grid flex="1">
<columns>
<column align="end"/>
<column flex="1"/>
</columns>
<rows>
<row align="center">
</hbox>
<hbox>
<button id="disclosureButton" dlgtype="disclosure" class="exit-dialog"
oncommand="showhideinfo();"/>
<spacer flex="1"/>
<hbox id="okCancelButtonsRight"/>
</hbox>
<vbox id="infobox" hidden="true" persist="hidden">
<separator class="groove"/>
<grid flex="1">
<columns>
<column/>
<column flex="1"/>
</columns>
<rows>
<row align="center">
<hbox align="center" pack="end">
<label value="&props.name.label;"/>
<textbox id="ifl_name" readonly="true"/>
</row>
<row align="center">
</hbox>
<textbox id="ifl_name" readonly="true" class="plain"/>
</row>
<row align="center">
<hbox align="center" pack="end">
<label value="&props.value.label;"/>
<textbox id="ifl_value" readonly="true"/>
</row>
<row align="center">
</hbox>
<textbox id="ifl_value" readonly="true" class="plain"/>
</row>
<row align="center">
<hbox align="center" pack="end">
<label id="ifl_isDomain" value="&props.domain.label;"/>
<textbox id="ifl_host" readonly="true"/>
</row>
<row align="center">
</hbox>
<textbox id="ifl_host" readonly="true" class="plain"/>
</row>
<row align="center">
<hbox align="center" pack="end">
<label value="&props.path.label;"/>
<textbox id="ifl_path" readonly="true"/>
</row>
<row align="center">
</hbox>
<textbox id="ifl_path" readonly="true" class="plain"/>
</row>
<row align="center">
<hbox align="center" pack="end">
<label value="&props.secure.label;"/>
<textbox id="ifl_isSecure" readonly="true"/>
</row>
<row align="center">
</hbox>
<textbox id="ifl_isSecure" readonly="true" class="plain"/>
</row>
<row align="center">
<hbox align="center" pack="end">
<label value="&props.expires.label;"/>
<textbox id="ifl_expires" readonly="true"/>
</row>
<row align="center" id="policyField" hidden="true">
</hbox>
<textbox id="ifl_expires" readonly="true" class="plain"/>
</row>
<row align="center" id="policyField" hidden="true">
<hbox align="center" pack="end">
<label value="&props.policy.label;"/>
<textbox id="ifl_policy" readonly="true"/>
</row>
</rows>
</grid>
</groupbox>
</hbox>
<textbox id="ifl_policy" readonly="true" class="plain"/>
</row>
</rows>
</grid>
</vbox>
</hbox>
</vbox>
</dialog>

9
toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.dtd
Просмотреть файл

@ -1,14 +1,15 @@
<!ENTITY props.box.label "About this cookie">
<!ENTITY props.name.label "Name:">
<!ENTITY props.value.label "Information:">
<!ENTITY props.value.label "Content:">
<!ENTITY props.domain.label "Host:">
<!ENTITY props.path.label "Path:">
<!ENTITY props.secure.label "Server Secure:">
<!ENTITY props.expires.label "Expires:">
<!ENTITY props.policy.label "Policy:">
<!ENTITY button.rememberdecision.label "Remember this decision">
<!ENTITY button.yes.label "Yes">
<!ENTITY button.no.label "No">
<!ENTITY button.allow.label "Allow">
<!ENTITY button.deny.label "Deny">
<!ENTITY dialog.title "Confirm">
<!ENTITY dialog.remember.label "Use my choice for all cookies from this site">
<!ENTITY dialog.remember.accesskey "U">

13
toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.properties
Просмотреть файл

@ -7,10 +7,13 @@ atEndOfSession=at end of session
showDetails=Show Details
hideDetails=Hide Details
permissionToSetACookie = The site %S wants to set a cookie. Do you want to allow it?
permissionToSetSecondCookie = The site %S wants to set a second cookie. Do you want to allow it?
showDetailsAccessKey = S
hideDetailsAccessKey = H
permissionToSetACookie = The site %S wants to set a cookie.
permissionToSetSecondCookie = The site %S wants to set a second cookie.
# LOCALIZATION NOTE (PermissionToSetAnotherCookie): First %S: sitename, second %S: number of cookies already present for that site
permissionToSetAnotherCookie = The site %S wants permission to set another cookie. You already have %S cookies from this site. Do you want to allow it?
permissionToModifyCookie = The site %S wants to modify an existing cookie. Do you want to allow it?
permissionToAcceptImage = The site %S wants to load an image. Do you want to allow it?
permissionToSetAnotherCookie = The site %S wants permission to set another cookie.\nYou already have %S cookies from this site.
permissionToModifyCookie = The site %S wants to modify an existing cookie.
permissionToAcceptImage = The site %S wants to load an image.
rememberThisDecision = Remember this decision