Skip to content
This repository has been archived by the owner on May 22, 2021. It is now read-only.

refactored ftl file #269

Merged
merged 10 commits into from
Jul 25, 2017
Merged

refactored ftl file #269

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2c77d94
refactored ftl file
abhinadduri Jul 20, 2017
47fd387
added toml file
abhinadduri Jul 21, 2017
8ebfaf9
adding requested changes
abhinadduri Jul 21, 2017
28e496f
more fixes
abhinadduri Jul 21, 2017
b123b73
added comment to expiry column header
abhinadduri Jul 21, 2017
168a711
Firefox Send and Test Pilot should not be localized
abhinadduri Jul 21, 2017
eb73dbf
removed empty lines
abhinadduri Jul 24, 2017
330da9b
merging master
abhinadduri Jul 25, 2017
4065bbc
removing bundle files
abhinadduri Jul 25, 2017
10d489f
fixed issues, fluentfmt output matches
abhinadduri Jul 25, 2017
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
5 changes: 2 additions & 3 deletions frontend/src/upload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,16 +321,15 @@ $(document).ready(function() {
popupDiv.classList.add('popup');
const popupDelSpan = document.createElement('span');
$(popupDelSpan).addClass('del-file');
$(popupDelSpan).attr('data-l10n-id', 'sentFilesTitle4');
$(popupDelSpan).attr('data-l10n-id', 'deleteFileList');

const popupNvmSpan = document.createElement('span');
$(popupNvmSpan).addClass('nvm');
$(popupNvmSpan).attr('data-l10n-id', 'nevermindButton');

$popupText.html([
popupDelSpan,
' ',
' ',
'<br/>',
popupNvmSpan
]);

Expand Down
12 changes: 12 additions & 0 deletions l10n.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

basepath = "."

[env]
l = "{l10n_base}/public/locales/{locale}/"

[[paths]]
reference = "public/locales/en-US/**"
l10n = "{l}**"
65 changes: 40 additions & 25 deletions public/locales/send.en-US.ftl → public/locales/en-US/send.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Firefox Send is a brand name and should not be localized.
title = Firefox Send

uploadPageHeader = Private, Encrypted File Sharing
Expand All @@ -7,7 +8,7 @@ uploadPageLearnMore = Learn more
uploadPageDropMessage = Drop your file here to start uploading
uploadPageSizeMessage = For the most reliable operation, it’s best to keep your file under 1GB
uploadPageBrowseButton = Select a file on your computer
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you actually need the string on the entity, or only on the title attribute? If it's the former, this should be

uploadPageBrowseButton
    .title = Select a file on your computer

Same question for similar strings.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need the string on the entity as well.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK. @mathjazz is this going to work without issues in Pontoon?

.title = {uploadPageBrowseButtonTitle}
.title = Select a file on your computer
uploadPageMultipleFilesAlert = Uploading multiple files or a folder is currently not supported.

uploadPageBrowseButtonTitle = Upload file
Expand All @@ -19,68 +20,82 @@ notifyUploadDone = Your upload has finished.

uploadingPageMessage = Once your file uploads you will be able to set expiry options.
uploadingPageCancel = Cancel upload
.title = {uploadingPageCancel}
.title = Cancel upload
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

4 spaces indentation

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

uploadCancelNotification = Your upload was cancelled.

uploadingPageLargeFileMessage = This file is large and may take awhile to upload. Sit tight!
uploadingPageLargeFileMessage = This file is large and may take a while to upload. Sit tight!
uploadingFileNotification = Notify me when the upload is complete.
uploadSuccessConfirmHeader = Ready to Send

uploadSvgAlt.alt = Upload


//Note the spec suggests that this string is editable. That feature will not appear at Launch
uploadSvgAlt
.alt = Upload
uploadSuccessTimingHeader = The link to your file will expire after 1 download or in 24 hours.
copyUrlFormLabel = Copy and share the link to send your file:
copyUrlFormLabelWithName = Copy and share the link to send your file: { $filename }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the difference between these two strings?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you show me a screenshot of these two strings? I'm not sure I understand how and when they would be used, e.g. the first has a colon because it's followed by something?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

copyUrlFormLabel is only being used in one place. I refactored that line so we can safely remove this string now.

// Note: Title text for button should be the same

// Note: Title text for button should be the same.
copyUrlFormButton = Copy to clipboard
.title = {copyUrlFormButton}
.title = Copy to clipboard

copiedUrl = Copied!

// Note: Title text for button should be the same.
deleteFileButton = Delete file
.title = {deleteFileButton}
.title = Delete file
// Note: Title text for button should be the same.
sendAnotherFileLink = Send another file
.title = {sendAnotherFileLink}
.title = Send another file

downloadAltText.alt = Download
// Alternative text used on the download link/button (indicates an action).
downloadAltText
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this an alt text on a button or link? We need a comment to explain it's an action, not a noun

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's an alt text on an svg element. I'll go ahead and add in a comment.

.alt = Download
downloadFileName = Download { $filename }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One space before =

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, thanks!


downloadFileSize = ({ $size })
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does size come from and how it's formatted?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file size comes in from the server and is rendered through handlebars to the ftl file. It's a string in a human readable format, i.e. 12 Mb.

// 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
.title = {downloadButtonLabel}
.title = Download
downloadNotification = Your download has completed.
downloadFinish = Download Complete

// Firefox Send is a brand name and should not be localized. Title text for button should be the same.
sendYourFilesLink = Try Firefox Send
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs a note in case Firefox Send should not be localized

.title = {sendYourFilesLink}
.title = Try Firefox Send
downloadingPageProgress = Downloading { $filename } ({ $size })
downloadingPageMessage = Please leave this tab open while we fetch your file and decrypt it.

errorAltText.alt = Upload error
errorAltText
.alt = Upload error
errorPageHeader = Something went wrong!
errorPageMessage = There has been an error uploading the file.
errorPageLink = Send another file


linkExpiredAlt.alt = Link expired
linkExpiredAlt
.alt = Link expired
expiredPageHeader = This link has expired or never existed in the first place!
notSupportedHeader = Your browser is not supported.
notSupportedDetail = Unfortunately this browser does not support the web technology that powers Firefox Send. You'll need to try another browser. We recommend Firefox!
// 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!
downloadFirefoxButtonSub = Free Download


sentFilesTitle1 = File
sentFilesTitle2 = Copy URL
sentFilesTitle3 = Expires In
sentFilesTitle4 = Delete
uploadedFile = File
copyFileList = Copy URL
// expiryFileList is used as a column header
expiryFileList = Expires In
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How is this string used? It smells of contenation

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this string followed by?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Expires In is a column header. It isn't followed by anything, but there are times listed below it (one for each file).

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, can you add a comment explaining that? As simple as

// expiryFileList is used as a column header

P.S. I'm in EU timezone, I'll probably catch up next week with this

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure thing. Thanks for all the suggestions!

deleteFileList = Delete
nevermindButton = Never mind

nevermindButton = Nevermind
deleteButtonHover.title = {sentFilesTitle4}
copyUrlHover.title = {sentFilesTitle2}
deleteButtonHover
.title = Delete
copyUrlHover
.title = Copy URL

footerLinkLegal = Legal
// Test Pilot is a proper name and should not be localized.
footerLinkAbout = About Test Pilot
footerLinkPrivacy = Privacy
footerLinkTerms = Terms
Expand Down
10 changes: 5 additions & 5 deletions views/index.handlebars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
<thead>
<tr>
<!-- htmllint attr-bans="false" -->
<th width="35%" data-l10n-id="sentFilesTitle1"></th>
<th width="25%" data-l10n-id="sentFilesTitle2"></th>
<th width="21%" data-l10n-id="sentFilesTitle3"></th>
<th width="12%" data-l10n-id="sentFilesTitle4"></th>
<th width="35%" data-l10n-id="uploadedFile"></th>
<th width="25%" data-l10n-id="copyFileList"></th>
<th width="21%" data-l10n-id="expiryFileList"></th>
<th width="12%" data-l10n-id="deleteFileList"></th>
<!-- htmllint tag-bans="$previous" -->
</tr>
</thead>
Expand Down Expand Up @@ -54,7 +54,7 @@
<div id="share-link" hidden="true">
<div class="title" data-l10n-id="uploadSuccessTimingHeader"></div>
<div id="share-window">
<div id="copy-text" data-l10n-id="copyUrlFormLabel"></div>
<div id="copy-text"></div>
<div id="copy">
<input id="link" type="url" value="" readonly/>
<button id="copy-btn" data-l10n-id="copyUrlFormButton"></button>
Expand Down
2 changes: 1 addition & 1 deletion views/layouts/main.handlebars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<meta name="defaultLanguage" content="en-US">
<meta name="availableLanguages" content="en-US">
<link rel="localization" href="/locales/send.{locale}.ftl">
<link rel="localization" href="/locales/{locale}/send.ftl">
<script defer src="/l20n/dist/web/l20n.js"></script>
</head>
<body>
Expand Down