i18n Issues Mega Issue part 2 (Controversial part) #1922
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,8 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import { useIntl } from '@edx/frontend-platform/i18n'; | ||
| import { getSupportedFormats } from '../videos-page/data/utils'; | ||
| import messages from './messages'; | ||
|
|
||
| export const useFileInput = ({ | ||
| onAddFile, | ||
|
|
@@ -23,17 +25,20 @@ export const useFileInput = ({ | |
| }; | ||
| }; | ||
|
|
||
| const FileInput = ({ fileInput: hook, supportedFileFormats, allowMultiple }) => { | ||
| const intl = useIntl(); | ||
| return ( | ||
| <input | ||
| accept={getSupportedFormats(supportedFileFormats)} | ||
| aria-label={intl.formatMessage(messages.fileInputAriaLabel)} | ||
| className="upload d-none" | ||
| onChange={hook.addFile} | ||
| ref={hook.ref} | ||
| type="file" | ||
| multiple={allowMultiple} | ||
| /> | ||
| ); | ||
| }; | ||
|
|
||
| FileInput.propTypes = { | ||
| fileInput: PropTypes.shape({ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -209,6 +209,11 @@ const messages = defineMessages({ | |
| defaultMessage: 'Upload error', | ||
| description: 'Title for upload error alert', | ||
| }, | ||
| fileInputAriaLabel: { | ||
| id: 'course-authoring.files-and-uploads.fileInput.ariaLabel', | ||
| defaultMessage: 'Upload a file', | ||
| description: 'Accessible (screen reader) label for file input', | ||
| }, | ||
| }); | ||
|
|
||
| export default messages; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -91,47 +91,47 @@ const SortAndFilterModal = ({ | |
| className="text-center" | ||
| value="displayName,asc" | ||
| type="radio" | ||
| aria-label={intl.formatMessage(messages.sortByNameAscendingAriaLabel)} | ||
| > | ||
| <FormattedMessage {...messages.sortByNameAscending} /> | ||
| </SelectableBox> | ||
| <SelectableBox | ||
| className="text-center" | ||
| value="dateAdded,desc" | ||
| type="radio" | ||
| aria-label={intl.formatMessage(messages.sortByNewestAriaLabel)} | ||
| > | ||
| <FormattedMessage {...messages.sortByNewest} /> | ||
| </SelectableBox> | ||
| <SelectableBox | ||
| className="text-center" | ||
| value="fileSize,desc" | ||
| type="radio" | ||
| aria-label={intl.formatMessage(messages.sortBySizeDescendingAriaLabel)} | ||
| > | ||
| <FormattedMessage {...messages.sortBySizeDescending} /> | ||
| </SelectableBox> | ||
| <SelectableBox | ||
| className="text-center" | ||
| value="displayName,desc" | ||
| type="radio" | ||
| aria-label={intl.formatMessage(messages.sortByNameDescendingAriaLabel)} | ||
| > | ||
| <FormattedMessage {...messages.sortByNameDescending} /> | ||
| </SelectableBox> | ||
| <SelectableBox | ||
| className="text-center" | ||
| value="dateAdded,asc" | ||
| type="radio" | ||
| aria-label={intl.formatMessage(messages.sortByOldestAriaLabel)} | ||
| > | ||
| <FormattedMessage {...messages.sortByOldest} /> | ||
| </SelectableBox> | ||
| <SelectableBox | ||
| className="text-center" | ||
| value="fileSize,asc" | ||
| type="radio" | ||
| aria-label={intl.formatMessage(messages.sortBySizeAscendingAriaLabel)} | ||
| > | ||
| <FormattedMessage {...messages.sortBySizeAscending} /> | ||
| </SelectableBox> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,31 +22,61 @@ const messages = defineMessages({ | |
| defaultMessage: 'Cancel', | ||
| }, | ||
| sortByNameAscending: { | ||
| id: 'course-authoring.files-and-videos.sort-and-filter.modal.sortByNameAscendingButton.label', | ||
| defaultMessage: 'Name (A-Z)', | ||
| }, | ||
| sortByNameAscendingAriaLabel: { | ||
| id: 'course-authoring.files-and-videos.sort-and-filter.modal.sortByNameAscendingButton.aria-label', | ||
| defaultMessage: 'name descending radio', | ||
| description: 'Accessible (screen reader) label for "name descending" filter', | ||
| }, | ||
| sortByNewest: { | ||
| id: 'course-authoring.files-and-videos.sort-and-filter.modal.sortByNewestButton.label', | ||
| defaultMessage: 'Newest', | ||
| }, | ||
| sortByNewestAriaLabel: { | ||
| id: 'course-authoring.files-and-videos.sort-and-filter.modal.sortByNewestButton.label-label', | ||
| defaultMessage: 'date added descending radio', | ||
| description: 'Accessible (screen reader) label for "date added descending" filter', | ||
| }, | ||
| sortBySizeDescending: { | ||
| id: 'course-authoring.files-and-videos.sort-and-filter.modal.sortBySizeDescendingButton.label', | ||
| defaultMessage: 'File size (High to low)', | ||
| }, | ||
| sortBySizeDescendingAriaLabel: { | ||
| id: 'course-authoring.files-and-videos.sort-and-filter.modal.sortBySizeDescendingButton.aria-label', | ||
| defaultMessage: 'file size descending radio', | ||
| description: 'Accessible (screen reader) label for "file size descending" filter', | ||
| }, | ||
| sortByNameDescending: { | ||
| id: 'course-authoring.files-and-videos.sort-and-filter.modal.sortByNameDescendingButton.label', | ||
| defaultMessage: 'Name (Z-A)', | ||
| }, | ||
| sortByNameDescendingAriaLabel: { | ||
| id: 'course-authoring.files-and-videos.sort-and-filter.modal.sortByNameDescendingButton.aria-label', | ||
| defaultMessage: 'name ascending radio', | ||
| description: 'Accessible (screen reader) label for "name ascending" filter', | ||
| }, | ||
| sortByOldest: { | ||
| id: 'course-authoring.files-and-videos.sort-and-filter.modal.sortByOldestButton.label', | ||
| defaultMessage: 'Oldest', | ||
| }, | ||
| sortByOldestAriaLabel: { | ||
| id: 'course-authoring.files-and-videos.sort-and-filter.modal.sortByOldestButton.aria-label', | ||
| defaultMessage: 'date added ascending radio', | ||
| description: 'Accessible (screen reader) label for "date added ascending" filter', | ||
| }, | ||
| sortBySizeAscending: { | ||
| id: 'course-authoring.files-and-videos.sort-and-filter.modal.sortBySizeAscendingButton.label', | ||
| defaultMessage: 'File size (Low to high)', | ||
| }, | ||
| sortBySizeAscendingAriaLabel: { | ||
| id: 'course-authoring.files-and-videos.sort-and-filter.modal.sortBySizeAscendingButton.aria-label', | ||
| defaultMessage: 'file size ascending radio', | ||
| description: 'Accessible (screen reader) label for "file size ascending" filter', | ||
| }, | ||
| applySortButton: { | ||
| id: 'course-authoring.files-and-videos.sort-and-filter.modal.applyySortButton.label', | ||
| defaultMessage: 'Apply', | ||
| }, | ||
| }); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just curious, why are you replacing the ternary operators?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This one was a suggestion from a fellow, so the code looks cleaner and more readable.