Skip to content

Commit

Permalink
Merge pull request #8633 from indirectlylit/fix-i18n-ids
Browse files Browse the repository at this point in the history
i18n fixes and updates – includes Mozambican Portuguese
  • Loading branch information
rtibbles authored Nov 8, 2021
2 parents 51d5f2d + d6b16ff commit c3238a8
Show file tree
Hide file tree
Showing 414 changed files with 11,820 additions and 10,873 deletions.
54 changes: 29 additions & 25 deletions kolibri/core/assets/src/mixins/commonCoreStrings.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
retryAction: {
message: 'Retry',
context:
'Button which allows a user to retry a an action that may have failed due to an unexpected reason such as a loss of connection.',
'Button which allows a user to retry an action that may have failed due to an unexpected reason such as a loss of connection.',
},
removeAction: {
message: 'Remove',
Expand Down Expand Up @@ -126,7 +126,8 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
},
removeFromBookmarks: {
message: 'Remove from bookmarks',
context: "An action that removes a resource or topic from a user's bookmarks",
context:
"An action that removes a resource or topic from a user's bookmarks. The opposite of 'Save to bookmarks'.",
},
saveToBookmarks: {
message: 'Save to bookmarks',
Expand Down Expand Up @@ -182,7 +183,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
channelLabel: {
message: 'Channel',
context:
'Channels are collections of educational resources (video, audio, document files or interactive apps) prepared and organized by the channel curator for their use in Kolibri. A label for a single channel.',
'Channels are collections of educational resources (video, audio, document files or interactive apps) prepared and organized by the channel curator for their use in Kolibri.',
},
classCoachLabel: {
message: 'Class coach',
Expand Down Expand Up @@ -239,7 +240,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
},
facilityName: {
message: 'Facility name',
context: 'The name of the facility.',
context: "The name of the facility. For example: 'Demo facility'.",
},
facilityNameWithId: {
message: '{facilityName} ({id})',
Expand Down Expand Up @@ -272,7 +273,8 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
},
inProgressLabel: {
message: 'In progress',
context: 'Indicates a task such as a sync is in progress.',
context:
"Indicates a task such as a sync is in progress. A lesson or class could also be in progress if the learner hasn't finished it yet.",
},
kolibriLabel: {
message: 'Kolibri',
Expand All @@ -281,7 +283,8 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
},
languageLabel: {
message: 'Language',
context: 'Refers to the language that is used in a resource or in Kolibri',
context:
'Refers to the language that is used in a resource or in Kolibri. For example, users can filter learning resources by language.',
},
learnerLabel: {
message: 'Learner',
Expand Down Expand Up @@ -311,7 +314,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
},
noUsersExistLabel: {
message: 'No users exist',
context: 'There are no users in this facility',
context: 'Displays when there are no users in the facility.',
},
optionsLabel: {
message: 'Options',
Expand Down Expand Up @@ -408,10 +411,11 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
},
viewInformation: {
message: 'View information',
context: 'Show more detailed information about a resource',
context: 'Option to show more detailed information about a resource.',
},
moreOptions: {
message: 'More options',
context: 'Reveals a set of more options when clicked.',
},
userActionsColumnHeader: {
message: 'Actions',
Expand Down Expand Up @@ -440,7 +444,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
// Learning Activities
all: {
message: 'All',
context: 'A label for everything in the group of activities',
context: 'A label for everything in the group of activities.',
},
watch: {
message: 'Watch',
Expand Down Expand Up @@ -492,7 +496,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
},
dailyLife: {
message: 'Daily life',
context: 'Category type.',
context: 'Category type. See https://en.wikipedia.org/wiki/Everyday_life',
},
forTeachers: {
message: 'For teachers',
Expand All @@ -518,7 +522,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
},
computerScience: {
message: 'Computer science',
context: 'Category type.',
context: 'Category type. See https://en.wikipedia.org/wiki/Computer_science',
},
languageLearning: {
message: 'Language learning',
Expand Down Expand Up @@ -566,7 +570,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
},
physics: {
message: 'Physics',
context: 'Category type.',
context: 'Category type. See https://en.wikipedia.org/wiki/Physics.',
},
earthScience: {
message: 'Earth science',
Expand All @@ -580,25 +584,25 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
// Literature Subcategories
literature: {
message: 'Literature',
context: 'Category type.',
context: 'Category type. See https://en.wikipedia.org/wiki/Literature',
},
readingComprehension: {
message: 'Reading comprehension',
context: 'Category type.',
},
writing: {
message: 'Writing',
context: 'Category type.',
context: 'Category type. See https://en.wikipedia.org/wiki/Writing',
},
logicAndCriticalThinking: {
message: 'Logic and critical thinking',
context: 'Category type.',
context: 'Category type. See https://en.wikipedia.org/wiki/Critical_thinking',
},

// Social Sciences Subcategories
politicalScience: {
message: 'Political science',
context: 'Category type.',
context: 'Category type. See https://en.wikipedia.org/wiki/Political_science.',
},
sociology: {
message: 'Sociology',
Expand All @@ -621,11 +625,11 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
},
music: {
message: 'Music',
context: 'Category type.',
context: 'Category type. See https://en.wikipedia.org/wiki/Music',
},
dance: {
message: 'Dance',
context: 'Category type.',
context: 'Category type. See https://en.wikipedia.org/wiki/Dance',
},
drama: {
message: 'Drama',
Expand All @@ -639,7 +643,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
},
mechanicalEngineering: {
message: 'Mechanical engineering',
context: 'Category type.',
context: 'Category type. See https://en.wikipedia.org/wiki/Mechanical_engineering.',
},
webDesign: {
message: 'Web design',
Expand Down Expand Up @@ -668,7 +672,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
// Work Categories
professionalSkills: {
message: 'Professional skills',
context: 'Category type.',
context: 'Category type. Refers to skills that are related to a profession or a job.',
},
technicalAndVocationalTraining: {
message: 'Technical and vocational training',
Expand All @@ -693,7 +697,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
// Daily Life Categories
publicHealth: {
message: 'Public health',
context: 'Category type.',
context: 'Category type. See https://en.wikipedia.org/wiki/Public_health.',
},
entrepreneurship: {
message: 'Entrepreneurship',
Expand Down Expand Up @@ -722,7 +726,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
},
mentalHealth: {
message: 'Mental health',
context: 'Category type.',
context: 'Category type. See https://en.wikipedia.org/wiki/Mental_health',
},

// Teacher-Specific Categories
Expand Down Expand Up @@ -780,7 +784,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
taggedPdf: {
message: 'Tagged PDF',
context:
'A tagged PDF includes hidden accessibility markups (tags) that help to optimize the reading experience of those who use screen readers and other assistive technology (AT).\n\nhttps://taggedpdf.com/what-is-a-tagged-pdf/',
'A tagged PDF includes hidden accessibility markups (tags) that make the document accessible to those who use screen readers and other assistive technology (AT).\n\nhttps://taggedpdf.com/what-is-a-tagged-pdf/',
},
altText: {
message: 'Has alternative text description for images',
Expand Down Expand Up @@ -831,7 +835,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
},
specializedProfessionalTraining: {
message: 'Specialized professional training',
context: 'Level of education.',
context: 'Level of education that refers to training for a profession (job).',
},
allLevelsBasicSkills: {
message: 'All levels -- basic skills',
Expand Down Expand Up @@ -1013,7 +1017,7 @@ export const coreStrings = createTranslator('CommonCoreStrings', {
// Content activity
notStartedLabel: {
message: 'Not started',
context: 'For content that has not been viewed or engaged with yet',
context: 'Refers to content that has not been viewed nor engaged with yet.',
},
folder: {
message: 'Folder',
Expand Down
6 changes: 3 additions & 3 deletions kolibri/core/assets/src/mixins/commonSyncElements.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ const syncStrings = createTranslator('CommonSyncStrings', {
},
addNewAddressAction: {
message: 'Add new address',
context: 'Label for a button that open menu to save a new network address',
context: 'Label for a button that opens a menu to save a new network address.',
},
selectFacilityTitle: {
message: 'Select facility',
context:
'Title of the modal window where the user selects a facility to import from the source device',
'Title of the modal window where the user selects a facility to import from the source device, if there are multiple facilities available to import.',
},
adminCredentialsTitle: {
message: 'Enter admin credentials',
context: 'Title of the menu where the user provides credentials before importing facility',
context: 'Title of the menu where the user provides credentials before importing a facility.',
},
nameWithIdFragment: {
message: '{name} ({id})',
Expand Down
36 changes: 21 additions & 15 deletions kolibri/core/assets/src/mixins/notificationStrings.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import { createTranslator } from 'kolibri.utils.i18n';
export default createTranslator('NotificationStrings', {
classCreated: {
message: 'Class created',
context: 'Adding a class',
context: 'A confirmation message indicating that the user has created a class.',
},
classDeleted: {
message: 'Class deleted',
context: 'Deleting a class',
context: 'A confirmation message indicating that the user has deleted a class.',
},
coachesAssignedNoCount: {
message: '{count, plural, one {Coach assigned} other {Coaches assigned}}',
Expand Down Expand Up @@ -37,11 +37,11 @@ export default createTranslator('NotificationStrings', {
},
userCreated: {
message: 'User created',
context: 'Creating a new user',
context: 'A confirmation message indicating that a new user has been created.\n',
},
userDeleted: {
message: 'User deleted',
context: 'Deleting a user',
context: 'A confirmation message indicating that an existing user has been deleted.',
},
passwordReset: {
message: 'Password reset',
Expand All @@ -54,23 +54,25 @@ export default createTranslator('NotificationStrings', {
},
lessonCreated: {
message: 'Lesson created',
context: 'Creating a new lesson',
context: 'A confirmation message indicating that the user has created a lesson.',
},
lessonCopied: {
message: 'Lesson copied',
context: 'Copying a lesson to a classroom',
context: 'A confirmation message indicating that the user has copied a lesson to a class.',
},
lessonDeleted: {
message: 'Lesson deleted',
context: 'Deleting a lesson',
context: 'A confirmation message indicating that the user has deleted a lesson.',
},
resourcesAddedWithCount: {
message: '{count, number} {count, plural, one {resource added} other {resources added}}',
context: 'Adding a specified number of resources to a lesson',
context:
'Notification that appears when a user adds a specified number of resources to a lesson. For example, "75 resources added".',
},
resourcesRemovedWithCount: {
message: '{count, number} {count, plural, one {resource removed} other {resources removed}}',
context: 'Removing a specified number of resources from a lesson',
context:
'Notification that displays when a user removes a specified number of resources from a lesson. For example, "75 resources removed".',
},
resourcesAddedNoCount: {
message: '{count, plural, one {Resource added} other {Resources added}}',
Expand All @@ -82,27 +84,31 @@ export default createTranslator('NotificationStrings', {
},
resourceOrderSaved: {
message: 'Resource order saved',
context: 'Saving the new order of resources in a lesson',
context:
'A confirmation message indicating that the user has changed the order of the learning resources in a lesson by clicking and dragging them.',
},
quizCopied: {
message: 'Quiz copied',
context: 'Copying a quiz to a classroom',
context:
'A confirmation message indicating that the user has copied an existing quiz to a class.',
},
quizCreated: {
message: 'Quiz created',
context: 'Text will appear as a notification at the bottom after the new quiz is created',
context:
'Text will appear as a notification at the bottom of the screen after a user creates a new quiz.',
},
quizDeleted: {
message: 'Quiz deleted',
context: 'Deleting a quiz',
context:
'NotificationStrings.quizDeleted\n\nA confirmation message indicating that the user has deleted a quiz.',
},
groupCreated: {
message: 'Group created',
context: 'Creating a new learner group',
context: 'A confirmation message indicating that the user has created a new group of learners.',
},
groupDeleted: {
message: 'Group deleted',
context: 'Deleting a learner group',
context: 'A confirmation message indicating that the user has deleted a new group of learners.',
},
// TODO move more messages into this namespace:
// - "Quiz started"
Expand Down
6 changes: 3 additions & 3 deletions kolibri/core/assets/src/mixins/taskStrings.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const taskStrings = createTranslator('TaskStrings', {
},
taskFinishedStatus: {
message: 'Finished',
context: 'Generic task status',
context: 'Generic task status indicating that a task has been completed.',
},
taskFailedStatus: {
message: 'Failed',
Expand All @@ -40,7 +40,7 @@ const taskStrings = createTranslator('TaskStrings', {
},
unknownUsername: {
message: 'Unknown user',
context: 'A placeholder username if the username is not attached to Task',
context: 'A placeholder username if the username is not attached to a task.',
},

// Sync Facility Task strings
Expand Down Expand Up @@ -92,7 +92,7 @@ const taskStrings = createTranslator('TaskStrings', {
},
removeFacilityTaskLabel: {
message: 'Remove {facilityName}',
context: 'Description of a remove-facility task',
context: 'Description of a remove-facility task.',
},
removeFacilitySuccessStatus: {
message: 'Facility successfully removed',
Expand Down
6 changes: 6 additions & 0 deletions kolibri/core/assets/src/utils/intl-locale-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,12 @@ module.exports = function(locale) {
resolve(() => require('intl/locale-data/jsonp/pt-BR.js'));
});
});
case 'pt-mz':
return new Promise(function(resolve) {
require.ensure(['intl/locale-data/jsonp/pt-MZ.js'], function(require) {
resolve(() => require('intl/locale-data/jsonp/pt-MZ.js'));
});
});
case 'sw-tz':
return new Promise(function(resolve) {
require.ensure(['intl/locale-data/jsonp/sw-TZ.js'], function(require) {
Expand Down
1 change: 1 addition & 0 deletions kolibri/core/assets/src/utils/vue-intl-locale-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ module.exports = function() {
data.push(require('vue-intl/locale-data/my.js'));
data.push(require('vue-intl/locale-data/nyn.js'));
data.push(require('vue-intl/locale-data/pt.js'));
data.push(require('vue-intl/locale-data/pt.js'));
data.push(require('vue-intl/locale-data/sw.js'));
data.push(require('vue-intl/locale-data/te.js'));
data.push(require('vue-intl/locale-data/ur.js'));
Expand Down
3 changes: 2 additions & 1 deletion kolibri/core/assets/src/views/AppBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,8 @@
},
deviceStatus: {
message: 'Device status',
context: "Table column header in the 'Class learners' page.",
context:
"Table column header in the 'Class learners' page. Indicates the status of an individual learner's device.",
},
},
};
Expand Down
Loading

0 comments on commit c3238a8

Please sign in to comment.