update strings

This commit is contained in:
John Gruen 2019-02-22 16:42:08 +01:00
parent 47d75d8220
commit 7449d1c351
8 changed files with 87 additions and 57 deletions

View file

@ -17,7 +17,9 @@ export default class FileSender extends Nanobus {
}
get progressIndefinite() {
return ['fileSizeProgress', 'notifyUploadDone'].indexOf(this.msg) === -1;
return (
['fileSizeProgress', 'notifyUploadEncryptDone'].indexOf(this.msg) === -1
);
}
get sizes() {
@ -75,7 +77,7 @@ export default class FileSender extends Nanobus {
try {
const result = await this.uploadRequest.result;
const time = Date.now() - start;
this.msg = 'notifyUploadDone';
this.msg = 'notifyUploadEncryptDone';
this.uploadRequest = null;
this.progress = [1, 1];
const secretKey = arrayToB64(this.keychain.rawSecret);

View file

@ -265,9 +265,12 @@ module.exports.wip = function(state, emit) {
onblur="${blur}"
onchange="${add}"
/>
<div
class="flex flex-row items-center justify-between w-full p-2"
title="${state.translate('addFilesButton')}"
<label
for="file-upload"
class="flex flex-row items-center justify-between w-full p-2 cursor-pointer"
title="${state.translate('addFilesButtonWithSize', {
size: bytes(1000000)
})}"
>
<label
for="file-upload"
@ -275,10 +278,14 @@ module.exports.wip = function(state, emit) {
title="${state.translate('addFilesButton')}"
>
<img src="${assets.get('addfiles.svg')}" class="w-6 h-6 mr-2" />
${state.translate('addFilesButton')}
</label>
${state.translate('addFilesButtonWithSize', {
size: bytes(1000000)
})}
</div>
<div class="font-normal text-sm text-grey-darker">
${state.translate('totalSize', { size: bytes(state.archive.size) })}
${state.translate('totalSizeUpdate', {
size: bytes(state.archive.size)
})}
</div>
</div>
</div>
@ -370,8 +377,8 @@ module.exports.uploading = function(state, emit) {
<button
class="text-blue-dark hover:text-blue-darker focus:text-blue-darker self-end font-medium"
onclick=${cancel}
title="${state.translate('uploadingPageCancel')}">
${state.translate('uploadingPageCancel')}
title="${state.translate('uploadingPageCancelShort')}">
${state.translate('uploadingPageCancelShort')}
</button>
</send-upload-area>`;
@ -398,8 +405,8 @@ module.exports.empty = function(state, emit) {
>
${state.translate('uploadDropDragMessage')}
</div>
<div class="text-center text-base italic">
${state.translate('uploadDropClickMessage')}
<div class="pb-6 text-center text-base">
${state.translate('uploadDropButtonMessage')}
</div>
<input
id="file-upload"
@ -415,10 +422,17 @@ module.exports.empty = function(state, emit) {
for="file-upload"
role="button"
class="btn rounded-lg flex items-center mt-4"
title="${state.translate('addFilesButton')}"
title="${state.translate('addFilesButtonWithSize', {
size: bytes(1000000)
})}"
>
${state.translate('addFilesButton')}
${state.translate('addFilesButtonWithSize', {
size: bytes(1000000)
})}
</label>
<a class="center font-medium text-xs text-grey-dark mt-4 mb-2">
${state.translate('signInSizeBump', { size: bytes(1000000) })}
</a>
</send-upload-area>
`;

View file

@ -9,7 +9,8 @@ module.exports = function(name, url) {
>
<h1 class="font-bold my-4">${state.translate('notifyUploadDone')}</h1>
<p class="font-normal leading-normal text-grey-darker word-break-all">
${state.translate('copyUrlFormLabelWithName', { filename: name })}
${state.translate('copyUrlFormLabel')} <br />
${name}
</p>
<input
type="text"
@ -21,9 +22,9 @@ module.exports = function(name, url) {
<button
class="btn rounded-lg w-full flex-no-shrink focus:outline"
onclick="${copy}"
title="${state.translate('copyUrlFormButton')}"
title="${state.translate('copyUrlFormButtonText')}"
>
${state.translate('copyUrlFormButton')}
${state.translate('copyUrlFormButtonText')}
</button>
<button
class="text-blue-dark hover:text-blue-darker focus:text-blue-darker my-4 font-medium cursor-pointer focus:outline"

View file

@ -12,7 +12,7 @@ function password(state, emit) {
<div
class="h-full w-full flex flex-col items-center justify-center bg-white py-8"
>
<h1 class="mb-4">${state.translate('downloadFileTitle')}</h1>
<h1 class="mb-4">${state.translate('downloadFilesTitle')}</h1>
<form
class="flex flex-row flex-no-wrap w-full md:w-4/5"
onsubmit="${checkPassword}"
@ -118,15 +118,17 @@ module.exports = function(state, emit) {
content = html`
<div
id="download-complete"
class="flex flex-col items-center justify-center h-full w-full bg-white border border-grey-light p-2"
class="flex flex-col items-center justify-center h-full w-full bg-white p-2"
>
<h1 class="text-center font-bold my-4 text-2xl">
${state.translate('downloadFinish')}
</h1>
<p class="pb-2">${state.translate('downloadFinishText')}</p>
<p class="mb-4">
<a
href="/"
class="text-blue hover:text-blue-dark focus:text-blue-darker font-medium"
class="btn rounded-lg flex items-center mt-4"
role="button"
>${state.translate('sendYourFilesLink')}</a
>
</p>
@ -136,7 +138,14 @@ module.exports = function(state, emit) {
default:
content = html`
<div class="flex flex-col w-full h-full items-center mt-12">
<h1 class="">${state.translate('downloadFileTitle')}</h1>
<h1 class="mb-4">${state.translate('downloadFilesTitle')}</h1>
<p class="w-full md:w-4/5 pb-4 mb-4 text-center">
${state.translate('downloadFileText', {
name: 'name',
timeSpan: 'time span',
downloadCount: 'download count'
})}
</p>
${archiveTile.preview(state, emit)}
</div>
`;

View file

@ -10,19 +10,22 @@ module.exports = function(state, emit) {
class="flex flex-col items-center bg-white m-6 px-6 py-8 border border-grey-light md:border-none md:px-12 md:py-16 shadow w-full"
>
<h1 class="text-pink-dark text-2xl text-center">
${state.translate('expiredPageHeader')}
${state.translate('expiredPageHeaderUpdate')}
</h1>
<img
class="my-16"
src="${assets.get('illustration_expired.svg')}"
id="expired-img"
/>
<p class="max-w-md leading-normal">
${state.translate('uploadPageExplainer')}
<p class="pb-2">${state.translate('downloadFinishText')}</p>
<p class="mb-4">
<a
href="/"
class="btn rounded-lg flex items-center mt-4"
role="button"
>${state.translate('sendYourFilesLink')}</a
>
</p>
<a class="text-blue mt-10 font-medium" href="/">
${state.translate('sendYourFilesLink')}
</a>
</div>
</main>
`;

View file

@ -9,16 +9,15 @@ module.exports = function(trigger) {
let submitting = false;
return html`
<send-signup-dialog class="flex flex-col p-4">
<p class="p-8">
${state.translate('accountBenefitTitle')}
<ul class="my-2 leading-normal">
<li>${state.translate('accountBenefitLargeFiles', {
size: bytes(LIMITS.MAX_FILE_SIZE)
})}</li>
<li>${state.translate('accountBenefitExpiry')}</li>
<li>${state.translate('accountBenefitSync')}</li>
</ul>
</p>
<h2 class="font-bold">${state.translate('accountBenefitTitle')}</h3>
<ul class="my-2 leading-normal list-reset text-lg mb-8 mt-4">
<li>${state.translate('accountBenefitLargeFiles', {
size: bytes(LIMITS.MAX_FILE_SIZE)
})}</li>
<li>${state.translate('accountBenefitExpiry')}</li>
<li>${state.translate('accountBenefitExpiryTwo')}</li>
<li>${state.translate('accountBenefitSync')}</li>
</ul>
<form
onsubmit=${submitEmail}
data-no-csrf>
@ -26,7 +25,7 @@ module.exports = function(trigger) {
id="email-input"
type="text"
class="${hidden} border rounded-lg w-full px-2 py-1 h-12 mb-4 text-lg text-grey-darker leading-loose"
placeholder=${state.translate('emailEntryPlaceholder')} />
placeholder=${state.translate('emailEntryPlaceholderUpdate')} />
<input
class="btn rounded-lg w-full flex flex-no-shrink items-center justify-center"
value="${state.translate('signInMenuOption')}"

View file

@ -69,7 +69,7 @@ function outdatedStrings(state) {
function unsupportedStrings(state) {
return {
header: state.translate('notSupportedHeader'),
description: state.translate('notSupportedDetail'),
description: state.translate('notSupportedDetailUpdate'),
button: state.translate('downloadFirefoxButtonSub')
};
}