Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix broken build on develop #11297

Merged
merged 2 commits into from
Sep 26, 2023
+31 −15
Merged

Fix broken build on develop #11297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25cbe6c
Add more diagnostic error handling in string extraction.
rtibbles Sep 25, 2023
ff0b47d
Fix incorrectly labelled message key.
rtibbles Sep 25, 2023
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
2 changes: 1 addition & 1 deletion packages/kolibri-common/strings/enhancedQuizManagementStrings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const enhancedQuizManagementStrings = createTranslator('EnhancedQuizManag
message: 'Quiz resource selection',
},
selectResourcesFromChannels: {
messages: 'Select resources from channels',
message: 'Select resources from channels',
},
sectionOrder: {
message: 'Section order',
Expand Down
44 changes: 30 additions & 14 deletions packages/kolibri-tools/lib/i18n/astUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,23 +140,33 @@ function getObjectifiedValue(nodePropertyValue) {
n => n.key.name === 'message'
);

if (!messageNode) {
// This is mostly for dev debugging. If this happens then somethings wrong enough that
// we should let the user know and just bail for now until it gets worked out
throw new ReferenceError(
'Trying to get the message from an object in $trs but did not find a `message` key.\n' +
'Available keys on the message object include:\n' +
get(nodePropertyValue, 'properties', [])
.map(p => p.key.name)
.join(', ')
);
}

message = stringFromAnyLiteral(messageNode);
try {
context = stringFromAnyLiteral(contextNode);
} catch (e) {
context = '';
}

if (!message) {
// This is mostly for dev debugging. If this happens then somethings wrong enough that
// we should let the user know and just bail for now until it gets worked out
logging.error(
'Trying to get the message from an object in $trs but did not find a `message` key.\n\n',
'The above error is unrecoverable (✖╭╮✖). This indicates a bug that needs fixing. Sorry.'
);
logging.error(nodePropertyValue.properties[0].value.value);
process.exit(1);
}
}
if (!message) {
// This is mostly for dev debugging. If this happens then somethings wrong enough that
// we should let the user know and just bail for now until it gets worked out
throw new ReferenceError(
'Trying to get the message from an object in $trs but did not find a `message` key.\n\n' +
'The above error is unrecoverable (✖╭╮✖). This indicates a bug that needs fixing. Sorry.' +
nodePropertyValue.properties[0].value.value
);
}
return { message, context: `${CONTEXT_LINE}${context}` };
}
Expand Down Expand Up @@ -351,9 +361,15 @@ function generateMessagesFromASTNode(messageNodeProperties, messageNamespace, as
if (messageNodeProperties && messageNamespace) {
// Now that we have the properties we care about, let's do the thing we're here to do!
for (const $trProperty of messageNodeProperties) {
results[
`${messageNamespace}.${getPropertyKey($trProperty, ast, filePath)}`
] = getObjectifiedValue($trProperty.value);
const messageId = `${messageNamespace}.${getPropertyKey($trProperty, ast, filePath)}`;
try {
results[messageId] = getObjectifiedValue($trProperty.value);
} catch (e) {
logging.error('Issue in file: ', filePath);
logging.error('Could not extract message from: ', messageId);
logging.error(e);
process.exit(1);
}
}
}
return results;
Expand Down