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

Jump to bottom

update quiz entry code for some localization bugs #2862

Closed
wants to merge 2 commits into from
Closed

update quiz entry code for some localization bugs #2862

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
52f8672
update quiz entry code for some localization bugs
JackySun9 Sep 10, 2024
ba52918
Merge branch 'stage' of https://github.com/adobecom/milo into stage
JackySun9 Sep 18, 2024
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
4 changes: 3 additions & 1 deletion libs/blocks/quiz-entry/quiz-entry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { getQuizEntryData, handleNext, handleSelections } from './utils.js';
import { mlField, getMLResults } from './mlField.js';
import { GetQuizOption } from './quizoption.js';
import { quizPopover, getSuggestions } from './quizPopover.js';
import { getConfig } from '../../utils/utils.js';

export const locationWrapper = {
redirect: (url) => {
Expand Down Expand Up @@ -343,7 +344,8 @@ const App = ({

if (!dataLoaded || !selectedQuestion) return null;

return html`<div class="quiz-container">
const { locale } = getConfig();
return html`<div class="quiz-container${locale?.ietf === 'ja-JP' ? ' jpwordwrap-disabled' : ''}">
<div class="quiz-heading-container">
<div id="question" class="quiz-title">${quizLists.strings[selectedQuestion.questions].heading}</div>
<div class="quiz-subtitle">${quizLists.strings[selectedQuestion.questions]['sub-head']}</div>
Expand Down
9 changes: 5 additions & 4 deletions libs/blocks/quiz-entry/quizoption.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { html, useState, useEffect } from '../../deps/htm-preact.js';
import { getSwipeDistance, getSwipeDirection } from '../carousel/carousel.js';
import { removeLeftToRightMark } from '../quiz/utils.js';

export const OptionCard = ({
text, title, image, icon, iconTablet, iconDesktop, options,
Expand All @@ -17,13 +18,13 @@ export const OptionCard = ({

const getIconHtml = () => html`<div class="quiz-option-icon">
<picture>
${iconDesktop && html`<source media="(min-width: 1024px)" srcset="${iconDesktop}" />`}
${iconTablet && html`<source media="(min-width: 600px)" srcset="${iconTablet}" />`}
<img src="${icon}" alt="" loading="lazy" />
${iconDesktop && html`<source media="(min-width: 1024px)" srcset="${removeLeftToRightMark(iconDesktop)}" />`}
${iconTablet && html`<source media="(min-width: 600px)" srcset="${removeLeftToRightMark(iconTablet)}" />`}
<img src="${removeLeftToRightMark(icon)}" alt="" loading="lazy" />
</picture>
</div>`;

const imageHtml = image ? html`<div class="quiz-option-image" style="background-image: url('${image}'); background-size: cover" loading="lazy"></div>` : null;
const imageHtml = image ? html`<div class="quiz-option-image" style="background-image: url('${removeLeftToRightMark(image)}'); background-size: cover" loading="lazy"></div>` : null;
const titleHtml = title ? html`<p class="quiz-option-title">${title}</p>` : null;
const textHtml = text ? html`<p class="quiz-option-text">${text}</p>` : null;

Expand Down
6 changes: 3 additions & 3 deletions libs/blocks/quiz-entry/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getNormalizedMetadata } from '../quiz/utils.js';
import { getNormalizedMetadata, getLocalizedURL } from '../quiz/utils.js';

export async function fetchJson(path) {
const response = await fetch(path);
Expand Down Expand Up @@ -104,8 +104,8 @@ export const handleSelections = (prevSelections, selectedQuestion, selections) =

export async function getQuizEntryData(el) {
const blockData = getNormalizedMetadata(el);
const dataPath = blockData.data.text;
const quizPath = blockData.quiz.text;
const dataPath = getLocalizedURL(blockData.data.text);
const quizPath = getLocalizedURL(blockData.quiz.text);
const maxQuestions = Number(blockData.maxquestions?.text) || 10;
const analyticsType = blockData.analyticstype?.text;
const analyticsQuiz = blockData.analyticsquiz?.text;
Expand Down
Loading