Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
caiosba committed Oct 2, 2024
2 parents 347683f + 9ddadea commit eb8b89a
Show file tree
Hide file tree
Showing 144 changed files with 11,350 additions and 6,742 deletions.
2 changes: 2 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ deploy_qa:
AWS_DEFAULT_REGION: $AWS_DEFAULT_REGION
script:
- apk add --no-cache curl jq python3 py3-pip git
- pip install setuptools==75.1.0
- pip install urllib3==2.0.6
- pip install botocore==1.31.62
- pip install boto3==1.28.62
Expand Down Expand Up @@ -81,6 +82,7 @@ deploy_live:
AWS_DEFAULT_REGION: $AWS_DEFAULT_REGION
script:
- apk add --no-cache curl jq python3 py3-pip git
- pip install setuptools==75.1.0
- pip install urllib3==2.0.6
- pip install botocore==1.31.62
- pip install boto3==1.28.62
Expand Down
2 changes: 1 addition & 1 deletion localization/react-intl/src/app/components/ExportList.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "exportList.error",
"description": "Message displayed when list export fails.",
"defaultMessage": "Export failed. Please try again later or contact our support if the error persists."
"defaultMessage": "Export failed. Please ensure you have the necessary permissions to perform this operation and that the number of results is fewer than 10,000."
},
{
"id": "exportList.success",
Expand Down
15 changes: 10 additions & 5 deletions localization/react-intl/src/app/components/UploadFile.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
{
"id": "uploadFile.message",
"description": "Message to the user describing the requirements for uploading an image",
"defaultMessage": "Drop an image file here, or click to upload a file (max size: {upload_max_size}, allowed extensions: {upload_extensions}, allowed dimensions between {upload_min_dimensions} and {upload_max_dimensions} pixels)"
"defaultMessage": "<p>Drop an image file here, or click to upload a file</p><p>Max File Size: <strong>{upload_max_size}</strong></p><p>Allowed Extensions: <strong>{upload_extensions}</strong></p><p>Allowed Dimensions: <strong>{upload_min_dimensions} and {upload_max_dimensions} pixels</strong></p>"
},
{
"id": "uploadFile.videoMessage",
"description": "Message to the user describing the requirements for uploading a video",
"defaultMessage": "Drop a video file here, or click to upload a file (max size: {video_max_size}, allowed extensions: {video_extensions})"
"defaultMessage": "<p>Drop a video file here, or click to upload a file</p><p>Max File Size: <strong>{video_max_size}</strong></p><p>Allowed Extensions: <strong>{video_extensions}</strong></p>"
},
{
"id": "uploadFile.audioMessage",
"description": "Message to the user describing the requirements for uploading an audio file",
"defaultMessage": "Drop an audio file here, or click to upload a file (max size: {audio_max_size}, allowed extensions: {audio_extensions})"
"defaultMessage": "<p>Drop an audio file here, or click to upload a file</p><p>Max File Size: <strong>{audio_max_size}</strong></p><p>Allowed Extensions: <strong>{audio_extensions}</strong></p>"
},
{
"id": "uploadFile.fileMessage",
Expand All @@ -22,7 +22,7 @@
{
"id": "uploadFile.imageVideoAudioMessage",
"description": "Message to the user describing the requirements for uploading an image, video, or audio file using this component",
"defaultMessage": "Drop a file here, or click to upload a file (max size: {file_max_size}, allowed extensions: {file_extensions})"
"defaultMessage": "<p>Drop a file here, or click to upload a file</p><p>Max File Size: <strong>{file_max_size}</strong></p><p>Allowed Extensions: <strong>{file_extensions}</strong></p>"
},
{
"id": "uploadFile.invalidExtension",
Expand All @@ -34,9 +34,14 @@
"description": "Error message when the user tries to upload a file that is over the size limit",
"defaultMessage": "The file size should be less than {size}. Please try with a smaller file."
},
{
"id": "uploadFile.removeFileButton",
"description": "Label for the remove uploaded file button",
"defaultMessage": "Remove"
},
{
"id": "uploadFile.changeFile",
"description": "Output of the uploaded filename and how to change the file",
"defaultMessage": "{filename} (click or drop to change)"
"defaultMessage": "<strong>{filename}</strong>(click or drop to change)"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
[
{
"id": "articleTrash.deletionWarning",
"description": "Warning message indicating the article will be deleted permanently after 30 days",
"defaultMessage": "It can be removed from the Trash later, but it will be deleted permanently after 30 days."
},
{
"id": "articleTrash.associationWarning",
"description": "Warning message confirming the article will no longer be able to be associated with media items",
"defaultMessage": "Are you sure? If you send this article to the trash it will no longer be available to be associated with media responses."
},
{
"id": "articleTrash.deletionWarningExplainer",
"description": "Warning message indicating the explainer article will be deleted permanently after 30 days",
"defaultMessage": "It can be linked again if the article is removed from the Trash. After 30 days, this article will be permanently deleted."
},
{
"id": "articleTrash.restoreButton",
"description": "Button label for restoring an article",
"defaultMessage": "Restore from Trash"
},
{
"id": "articleTrash.trashButton",
"description": "Button label for trashing an article",
"defaultMessage": "Move to Trash"
},
{
"id": "articleForm.explainerTrashTitle",
"description": "Title for the trash dialog for explainer articles",
"defaultMessage": "Send Explainer to Trash?"
},
{
"id": "articleForm.factCheckTrashTitle",
"description": "Title for the trash dialog for fact-check articles",
"defaultMessage": "Send Claim & Fact-Check to Trash?"
},
{
"id": "articleTrash.associatedMediaWarning",
"description": "Title for the warning alert when deleting a fact-check not associated with a media item",
"defaultMessage": "Sending this article to the trash will unlink from the following media:"
},
{
"id": "articleTrash.explainerBody",
"description": "Body message for deleting an explainer article",
"defaultMessage": "If this article is currently associated with media, the link between the media and article will be removed."
},
{
"id": "articleTrash.successTrashed",
"description": "Success message displayed when an article is moved to trash",
"defaultMessage": "Moved article to trash"
},
{
"id": "articleTrash.successRestored",
"description": "Success message displayed when an article is moved from the trash",
"defaultMessage": "Article moved from trash"
},
{
"id": "articleTrash.proceedLabel",
"description": "Label for the proceed button in the trash dialog",
"defaultMessage": "Move to Trash"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,10 @@
"id": "projectsComponent.published",
"description": "Label for a list displayed on the left sidebar that includes items that have published reports",
"defaultMessage": "Published"
},
{
"id": "projectsComponent.trash",
"description": "Label for a list displayed on the left sidebar that includes items that have been marked as Trashed",
"defaultMessage": "Trash"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[
{
"id": "explainers.sortTitle",
"description": "Label for sort criteria option displayed in a drop-down in the explainers page.",
"defaultMessage": "Title"
},
{
"id": "explainers.sortLanguage",
"description": "Label for sort criteria option displayed in a drop-down in the explainers page.",
"defaultMessage": "Language"
},
{
"id": "explainers.sortDate",
"description": "Label for sort criteria option displayed in a drop-down in the explainers page.",
"defaultMessage": "Updated (date)"
},
{
"id": "trashedArticles.title",
"description": "Title of the trashed articles page.",
"defaultMessage": "Trash"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
"description": "Label for sort criteria option displayed in a drop-down in listing pages",
"defaultMessage": "Report (status)"
},
{
"id": "searchResults.sortScore",
"description": "Label for sort criteria option displayed in a drop-down in listing pages",
"defaultMessage": "Search: Best Match"
},
{
"id": "searchResults.sortSubmitted",
"description": "Label for sort criteria option displayed in a drop-down in listing pages",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,37 +1,7 @@
[
{
"id": "tagList.create",
"description": "A label for a button that allows people to create a new tag based on text they have typed into an adjacent tag search bar when there are no search results.",
"defaultMessage": "+ Create search tags"
},
{
"id": "multiSelector.search",
"description": "The placeholder text in a search box.",
"defaultMessage": "Search…"
},
{
"id": "global.cancel",
"description": "Generic label for a button or link for a user to press when they wish to abort an in-progress operation",
"defaultMessage": "Cancel"
},
{
"id": "tagList.notFound",
"description": "A message that appears when a user has searched for tag text but no matches have been found.",
"defaultMessage": "No tags found"
},
{
"id": "tagList.submit",
"description": "Verb, infinitive form. Button to commit action of tagging an item",
"defaultMessage": "Tag"
},
{
"id": "tagList.empty",
"description": "A message that appears in a lag list when there are no available tags to display.",
"defaultMessage": "0 tags"
},
{
"id": "taglist.tooltipManage",
"description": "Tooltip message displayed on a tag item to let the user know they can manage the tags in the list",
"defaultMessage": "Manage Tags"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
[
{
"id": "tagList.create",
"description": "A label for a button that allows people to create a new tag based on text they have typed into an adjacent tag search bar when there are no search results.",
"defaultMessage": "+ Create search tags"
},
{
"id": "multiSelector.search",
"description": "The placeholder text in a search box.",
"defaultMessage": "Search…"
},
{
"id": "global.cancel",
"description": "Generic label for a button or link for a user to press when they wish to abort an in-progress operation",
"defaultMessage": "Cancel"
},
{
"id": "tagList.notFound",
"description": "A message that appears when a user has searched for tag text but no matches have been found.",
"defaultMessage": "No tags found"
},
{
"id": "tagList.submit",
"description": "Verb, infinitive form. Button to commit action of tagging an item",
"defaultMessage": "Tag"
},
{
"id": "taglist.tooltipManage",
"description": "Tooltip message displayed on a tag item to let the user know they can manage the tags in the list",
"defaultMessage": "Manage Tags"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
[
{
"id": "articlesComponent.articles",
"description": "The navigation name of the articles section",
"defaultMessage": "Articles"
},
{
"id": "articlesComponent.claimAndFactChecks",
"description": "Label for a list displayed on the left sidebar that includes items that have claim & fact-checks",
"defaultMessage": "Claim & Fact-Checks"
},
{
"id": "articlesComponent.explainers",
"description": "Label for a list displayed on the left sidebar that includes items that have explainers",
"defaultMessage": "Explainers"
},
{
"id": "projectsComponent.importedReports",
"description": "Label for a list displayed on the left sidebar that includes items from the 'Imported fact-checks' channel",
"defaultMessage": "Imported"
},
{
"id": "projectsComponent.published",
"description": "Label for a list displayed on the left sidebar that includes items that have published reports",
"defaultMessage": "Published"
}
]
22 changes: 22 additions & 0 deletions localization/react-intl/src/app/components/drawer/DrawerFeeds.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[
{
"id": "projectsComponent.pendingInvitationFeedTitle",
"description": "Tooltip for a navigation item that has a status of a pending invitation",
"defaultMessage": "Pending invitation: {feedTitle}"
},
{
"id": "projectsComponent.sharedFeedNavHeader",
"description": "The navigation name of the shared feeds section with included Beta messaging and the total count of items in the list below",
"defaultMessage": "Shared Feeds [{feedsLength}] <sup>BETA</sup>"
},
{
"id": "projectsComponent.newSharedFeed",
"description": "Label for the button that navigates to shared feed creation page",
"defaultMessage": "New Shared Feed"
},
{
"id": "projectsComponent.noSharedFeeds",
"description": "Displayed under the shared feed header when there are no feeds in it",
"defaultMessage": "No shared feeds"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
[
{
"id": "teamSettingsNavigation.annotations",
"description": "Label for the Annotations settings navigation menu item",
"defaultMessage": "Annotations"
},
{
"id": "teamSettingsNavigation.data",
"description": "Label for the Data settings navigation menu item",
"defaultMessage": "Data"
},
{
"id": "teamSettingsNavigation.integrations",
"description": "Label for the Integrations settings navigation menu item",
"defaultMessage": "Integrations"
},
{
"id": "teamSettingsNavigation.languages",
"description": "Label for the Languages settings navigation menu item",
"defaultMessage": "Languages"
},
{
"id": "teamSettingsNavigation.members",
"description": "Label for the Members settings navigation menu item",
"defaultMessage": "Members"
},
{
"id": "teamSettingsNavigation.newsletter",
"description": "Label for the Newsletter settings navigation menu item",
"defaultMessage": "Newsletter"
},
{
"id": "teamSettingsNavigation.reports",
"description": "Label for the Reports settings navigation menu item",
"defaultMessage": "Reports"
},
{
"id": "teamSettingsNavigation.rules",
"description": "Label for the Rules settings navigation menu item",
"defaultMessage": "Rules"
},
{
"id": "teamSettingsNavigation.settings",
"description": "Header for the settings navigation menu items",
"defaultMessage": "Settings"
},
{
"id": "teamSettingsNavigation.similarity",
"description": "Label for the Similarity settings navigation menu item",
"defaultMessage": "Similarity"
},
{
"id": "teamSettingsNavigation.statuses",
"description": "Label for the Statuses settings navigation menu item",
"defaultMessage": "Statuses"
},
{
"id": "teamSettingsNavigation.tags",
"description": "Label for the Tags settings navigation menu item",
"defaultMessage": "Tags"
},
{
"id": "teamSettingsNavigation.tipline",
"description": "Label for the Tipline settings navigation menu item",
"defaultMessage": "Tipline"
},
{
"id": "teamSettingsNavigation.workspace",
"description": "Label for the Workspace settings navigation menu item",
"defaultMessage": "Workspace"
}
]
Loading

0 comments on commit eb8b89a

Please sign in to comment.