From 7449d1c35129be23152f983ae58a61e51874813f Mon Sep 17 00:00:00 2001 From: John Gruen Date: Fri, 22 Feb 2019 16:42:08 +0100 Subject: [PATCH 1/2] update strings --- app/fileSender.js | 6 ++++-- app/ui/archiveTile.js | 38 ++++++++++++++++++++++++----------- app/ui/copyDialog.js | 7 ++++--- app/ui/download.js | 17 ++++++++++++---- app/ui/notFound.js | 15 ++++++++------ app/ui/signupDialog.js | 21 +++++++++---------- app/ui/unsupported.js | 2 +- public/locales/en-US/send.ftl | 38 ++++++++++++++++++----------------- 8 files changed, 87 insertions(+), 57 deletions(-) diff --git a/app/fileSender.js b/app/fileSender.js index 47955068..7fabc4bf 100644 --- a/app/fileSender.js +++ b/app/fileSender.js @@ -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); diff --git a/app/ui/archiveTile.js b/app/ui/archiveTile.js index 56eff232..7ef0063c 100644 --- a/app/ui/archiveTile.js +++ b/app/ui/archiveTile.js @@ -265,9 +265,12 @@ module.exports.wip = function(state, emit) { onblur="${blur}" onchange="${add}" /> -
+ ${state.translate('addFilesButtonWithSize', { + size: bytes(1000000) + })} +
- ${state.translate('totalSize', { size: bytes(state.archive.size) })} + ${state.translate('totalSizeUpdate', { + size: bytes(state.archive.size) + })}
@@ -370,8 +377,8 @@ module.exports.uploading = function(state, emit) { `; @@ -398,8 +405,8 @@ module.exports.empty = function(state, emit) { > ${state.translate('uploadDropDragMessage')} -
- ${state.translate('uploadDropClickMessage')} +
+ ${state.translate('uploadDropButtonMessage')}
- ${state.translate('addFilesButton')} + ${state.translate('addFilesButtonWithSize', { + size: bytes(1000000) + })} + + ${state.translate('signInSizeBump', { size: bytes(1000000) })} + `; diff --git a/app/ui/copyDialog.js b/app/ui/copyDialog.js index 0d2e6485..93e4efcc 100644 --- a/app/ui/copyDialog.js +++ b/app/ui/copyDialog.js @@ -9,7 +9,8 @@ module.exports = function(name, url) { >

${state.translate('notifyUploadDone')}

- ${state.translate('copyUrlFormLabelWithName', { filename: name })} + ${state.translate('copyUrlFormLabel')}
+ ${name}

- ${state.translate('copyUrlFormButton')} + ${state.translate('copyUrlFormButtonText')}
`; diff --git a/app/ui/signupDialog.js b/app/ui/signupDialog.js index 0182cfea..cc77a5aa 100644 --- a/app/ui/signupDialog.js +++ b/app/ui/signupDialog.js @@ -9,16 +9,15 @@ module.exports = function(trigger) { let submitting = false; return html` -

- ${state.translate('accountBenefitTitle')} -

-

+

${state.translate('accountBenefitTitle')}

+ @@ -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')} /> [one] 1 file *[other] { $num } files } -totalSize = Total Size: { $size } -copyUrlFormLabelWithName = Copy and share the link to send your file: { $filename } -copyUrlFormButton = Copy to clipboard +totalSize = Total size: { $size } +copyUrlFormLabel = Copy the link to share your file: +copyUrlFormButtonText = Copy link copiedUrl = Copied! deleteFileButton = Delete file sendAnotherFileLink = Send another file @@ -71,13 +70,15 @@ downloadFileSize = ({ $size }) unlockInputLabel = Enter Password unlockInputPlaceholder = Password unlockButtonLabel = Unlock -downloadFileTitle = Download Encrypted File +downloadFilesTitle = Download Files +downloadFileText = {$name} was encrypted with Firefox Send, and will expire after { $timeSpan } or { $downloadCount }. # Firefox Send is a brand name and should not be localized. downloadMessage = Your friend is sending you a file with Firefox Send, a service that allows you to share files with a safe, private, and encrypted link that automatically expires to ensure your stuff does not remain online forever. # Text and title used on the download link/button (indicates an action). downloadButtonLabel = Download downloadNotification = Your download has completed. downloadFinish = Download Complete +downloadFinishText = Try Firefox Send for simple, safe file sharing. # This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)". fileSizeProgress = ({ $partialSize } of { $totalSize }) # Firefox Send is a brand name and should not be localized. @@ -98,10 +99,10 @@ tooManyArchives = { $count -> *[other] Only { $count } archives are allowed. } linkExpiredAlt = Link expired -expiredPageHeader = This link has expired or never existed in the first place! +expiredPageHeaderUpdate = This link has expired. notSupportedHeader = Your browser is not supported. # Firefox Send is a brand name and should not be localized. -notSupportedDetail = Unfortunately this browser does not support the web technology that powers Firefox Send. You’ll need to try another browser. We recommend Firefox! +notSupportedDetailUpdate = Firefox Send will not work with this browser. Send works best with the latest version of Firefox, and will work with the current version of most browsers. notSupportedLink = Why is my browser not supported? notSupportedOutdatedDetail = Unfortunately this version of Firefox does not support the web technology that powers Firefox Send. You’ll need to update your browser. updateFirefox = Update Firefox @@ -121,8 +122,6 @@ deletePopupCancel = Cancel deleteButtonHover = Delete copyUrlHover = Copy URL footerLinkLegal = Legal -# Test Pilot is a proper name and should not be localized. -footerLinkAbout = About Test Pilot footerLinkPrivacy = Privacy footerLinkTerms = Terms footerLinkPrivacyAndTerms = Privacy & Terms @@ -148,10 +147,10 @@ maxPasswordLength = Maximum password length: { $length } # A short status message shown when there was an error setting the password passwordSetError = This password could not be set pageHeaderCredits = from the makers of Firefox -addFilesButton = Add file(s) +addFilesButtonWithSize = Add file(s) up to { $size } uploadFilesButton = Upload uploadDropDragMessage = Drop files here -uploadDropClickMessage = or click to select a file +uploadDropButtonMessage = or click to select files addPasswordMessage = Protect with password addPasswordLabel = Password: copyUrlLabel = Copy and share this link: @@ -162,15 +161,18 @@ signInLearnMore = Learn more! downloadProgressButton = Downloading... { $progress } downloadMessage2 = Firefox Send lets you share files with a safe, private, and encrypted link that automatically expires to ensure your stuff does not remain online forever. signInEmailEnter = Enter your Email -emailEntryPlaceholder = Email +emailEntryPlaceholder = Enter your email +signInSizeBump = Sign in to send up to {$size} signInContinueMessage = to continue to Firefox Send signInContinueButton = Continue signInMenuOption = Sign in/up +signInNextOption = Continue accountMenuOption = Firefox Account -accountBenefitTitle = With a free Firefox Account with Send you can: -accountBenefitLargeFiles = Upload larger files (up to { $size }) -accountBenefitExpiry = Have more expiry options -accountBenefitSync = Manage your uploads across devices +accountBenefitTitle = Create a Firefox Account or sign in to: +accountBenefitLargeFiles = Share files up to { $size} +accountBenefitExpiry = Share files with more people +accountBenefitExpiryTwo = Keep links active for up to { days } days +accountBenefitSync = Manage shared files from any device manageAccount = Manage Account logOut = Sign Out okButton = Ok From c8e6e761d03f56f5c698f456e2ab1d40d3c9457f Mon Sep 17 00:00:00 2001 From: Danny Coates Date: Fri, 22 Feb 2019 10:37:52 -0800 Subject: [PATCH 2/2] filled in size placeholder and other malarkey --- app/ui/archiveTile.js | 34 ++++++++++++++++++---------------- app/ui/copyDialog.js | 4 +++- app/utils.js | 6 +++--- public/locales/en-US/send.ftl | 1 + 4 files changed, 25 insertions(+), 20 deletions(-) diff --git a/app/ui/archiveTile.js b/app/ui/archiveTile.js index 7ef0063c..556b194a 100644 --- a/app/ui/archiveTile.js +++ b/app/ui/archiveTile.js @@ -1,4 +1,4 @@ -/* global Android */ +/* global Android LIMITS */ const html = require('choo/html'); const raw = require('choo/html/raw'); @@ -265,12 +265,9 @@ module.exports.wip = function(state, emit) { onblur="${blur}" onchange="${add}" /> - - - ${state.translate('signInSizeBump', { size: bytes(1000000) })} - + ${upsell} `; diff --git a/app/ui/copyDialog.js b/app/ui/copyDialog.js index 93e4efcc..42f06a91 100644 --- a/app/ui/copyDialog.js +++ b/app/ui/copyDialog.js @@ -7,7 +7,9 @@ module.exports = function(name, url) { -

${state.translate('notifyUploadDone')}

+

+ ${state.translate('notifyUploadEncryptDone')} +

${state.translate('copyUrlFormLabel')}
${name} diff --git a/app/utils.js b/app/utils.js index 4933a808..4f2fa648 100644 --- a/app/utils.js +++ b/app/utils.js @@ -57,7 +57,7 @@ const LOCALIZE_NUMBERS = !!( ); const UNITS = ['B', 'kB', 'MB', 'GB']; -function bytes(num) { +function bytes(num, decimalDigits = 1) { if (num < 1) { return '0B'; } @@ -68,8 +68,8 @@ function bytes(num) { try { const locale = document.querySelector('html').lang; nStr = n.toLocaleString(locale, { - minimumFractionDigits: 1, - maximumFractionDigits: 1 + minimumFractionDigits: decimalDigits, + maximumFractionDigits: decimalDigits }); } catch (e) { // fall through diff --git a/public/locales/en-US/send.ftl b/public/locales/en-US/send.ftl index b75b542f..e649e94a 100644 --- a/public/locales/en-US/send.ftl +++ b/public/locales/en-US/send.ftl @@ -147,6 +147,7 @@ maxPasswordLength = Maximum password length: { $length } # A short status message shown when there was an error setting the password passwordSetError = This password could not be set pageHeaderCredits = from the makers of Firefox +addFilesButton = Add file(s) addFilesButtonWithSize = Add file(s) up to { $size } uploadFilesButton = Upload uploadDropDragMessage = Drop files here