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 1 commit
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
3 changes: 1 addition & 2 deletions frontend/src/upload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,8 +329,7 @@ $(document).ready(function() {

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

Expand Down
13 changes: 10 additions & 3 deletions 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 @@
// We might not need to localize this if it's a brand name.
title = Firefox Send

uploadPageHeader = Private, Encrypted File Sharing
Expand All @@ -22,7 +23,7 @@ uploadingPageCancel = Cancel upload
.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

Expand All @@ -43,16 +44,21 @@ deleteFileButton = Delete file
sendAnotherFileLink = Send another file
.title = Send another file

// This alt text and the download filename string are actions.
Copy link
Collaborator

Choose a reason for hiding this comment

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

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.

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.

// This is also an action.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Alternative text used on the download link/button (indicates an action).

(localizers don't see the whole file, only one string at a time)

downloadButtonLabel = Download
.title = Download
downloadNotification = Your download has completed.
downloadFinish = Download Complete

// We might not need to localize this if it's a brand name.
Copy link
Collaborator

Choose a reason for hiding this comment

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

You need to answer this question and a comment with the answer ;-)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Whoops... @wresuolc what are your thoughts on this?

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 = Try Firefox Send
downloadingPageProgress = Downloading { $filename } ({ $size })
Expand All @@ -69,15 +75,16 @@ 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!
// We might not need to localize the Firefox Send part of this string if it's a brand name.
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


uploadedFile = File
copyFileList = Copy URL
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 = Nevermind
nevermindButton = Never mind

deleteButtonHover
.title = Delete
Expand Down
2 changes: 1 addition & 1 deletion views/index.handlebars
View file
Open in desktop
Original file line number Diff line number Diff line change
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