Skip to content

Commit

Permalink
Merge branch 'develop' into hotfix/v1.22.3
Browse files Browse the repository at this point in the history
  • Loading branch information
tmeyer2115 authored Aug 10, 2021
2 parents 35be71f + 969270c commit dcb256a
Show file tree
Hide file tree
Showing 183 changed files with 3,894 additions and 1,988 deletions.
10 changes: 9 additions & 1 deletion .github/run_browserstack_acceptance.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,12 @@ export BROWSERSTACK_BUILD_ID="${GITHUB_BRANCH} - ${GITHUB_RUN_ID}"
COMMIT_MSG_TITLE=$(git log -n 1 --pretty=format:%s)
export BROWSERSTACK_TEST_RUN_NAME=$COMMIT_MSG_TITLE

npm run acceptance -- --browsers browserstack:ie@11.0 browserstack:safari browserstack:firefox
if [[ $GITHUB_BRANCH == release/*
|| $GITHUB_BRANCH == hotfix/*
|| $GITHUB_BRANCH == master
|| $GITHUB_BRANCH == support/* ]]
then
npm run acceptance -- --browsers browserstack:ie@11.0 browserstack:safari browserstack:firefox
else
npm run acceptance -- --browsers browserstack:ie@11.0 --concurrency 2
fi
31 changes: 31 additions & 0 deletions .github/run_translation_verification.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!/bin/bash

set -e

# Verifiy that the messages.pot file in the repo is up to date
# If there is a git diff after translations are extracted, the checked-in file is out of date
npm run extract-translations
git diff --exit-code translations/messages.pot > /dev/null # send stdout to /dev/null to reduce clutter in the CI output
diff_exit_code=$?

if test $diff_exit_code -eq 1
then
echo "Extracted translations are out of date. Run 'npm run extract-translations' and commit the updated pot file."
exit 1
else
echo "The messages.pot translation file is up to date."
fi

# Verify that translations are present for all languages
cd translations
if [[ $GITHUB_BASE_REF == refs/heads/release/*
|| $GITHUB_BASE_REF == refs/heads/hotfix/*
|| $GITHUB_BASE_REF == refs/heads/master
|| $GITHUB_BASE_REF == refs/heads/support/* ]]
then
for po_file in *.po
do msgcmp $po_file messages.pot
done
else
echo "Skipping the verification that all translations are present"
fi
22 changes: 22 additions & 0 deletions .github/workflows/translation-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Translation Test

on:
pull_request:

jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [15.x]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
- run: sudo apt-get install -qq gettext
- name: 'translation verification'
run: ./.github/run_translation_verification.sh
10 changes: 6 additions & 4 deletions cards/document-standard/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,12 @@
{{#if ariaLabel}}aria-label="{{ariaLabel}}"{{/if}}>
{{#if (any iconName iconUrl)}}
<div class="HitchhikerCTA-iconWrapper">
<div class="HitchhikerCTA-icon" data-component="IconComponent" data-opts='{
"iconUrl": "{{#if iconUrl}}{{#unless (isNonRelativeUrl iconUrl)}}{{@root.relativePath}}/{{/unless}}{{iconUrl}}{{/if}}",
"iconName": "{{iconName}}"
}'></div>
<div class="HitchhikerCTA-icon">
{{> icons/iconPartial
iconName=iconName
iconUrl=(relativePathHandler url=iconUrl relativePath=@root.relativePath)
}}
</div>
</div>
{{/if}}
<div class='HitchhikerCTA-iconLabel'>
Expand Down
19 changes: 11 additions & 8 deletions cards/event-standard/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,15 @@
{{#if showExcessDetailsToggle}}
<button class="HitchhikerCard-detailsToggle js-HitchhikerCard-detailsToggle">
{{card.showMoreDetails.showMoreText}}
<span data-component="IconComponent"
data-opts='{ "iconName": "chevron", "classNames": "Icon--sm Icon-collapseDown" }'></span>
<span>
{{> icons/builtInIcon iconName='chevron' classNames='Icon--sm Icon--collapseDown' }}
</span>
</button>
<button class="HitchhikerCard-detailsToggle js-HitchhikerCard-detailsToggle js-hidden">
{{card.showMoreDetails.showLessText}}
<span data-component="IconComponent"
data-opts='{ "iconName": "chevron", "classNames": "Icon--sm Icon-collapseUp" }'></span>
<span>
{{> icons/builtInIcon iconName='chevron' classNames='Icon--sm Icon--collapseUp' }}
</span>
</button>
{{/if}}
</div>
Expand All @@ -95,10 +97,11 @@
{{#if ariaLabel}}aria-label="{{ariaLabel}}"{{/if}}>
{{#if (any iconName iconUrl)}}
<div class="HitchhikerCTA-iconWrapper">
<div class="HitchhikerCTA-icon" data-component="IconComponent" data-opts='{
"iconUrl": "{{#if iconUrl}}{{#unless (isNonRelativeUrl iconUrl)}}{{@root.relativePath}}/{{/unless}}{{iconUrl}}{{/if}}",
"iconName": "{{iconName}}"
}'>
<div class="HitchhikerCTA-icon">
{{> icons/iconPartial
iconName=iconName
iconUrl=(relativePathHandler url=iconUrl relativePath=@root.relativePath)
}}
</div>
</div>
{{/if}}
Expand Down
25 changes: 13 additions & 12 deletions cards/faq-accordion/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
<h3 class="HitchhikerFaqAccordion-title">
{{{card.title}}}
</h3>
<div class="HitchhikerFaqAccordion-icon js-HitchhikerFaqAccordion-icon{{#if card.isExpanded}} HitchhikerFaqAccordion-icon--expanded{{/if}}"
data-component="IconComponent"
data-opts='{"iconName": "chevron"}'
data-prop="icon">
<div class="HitchhikerFaqAccordion-icon js-HitchhikerFaqAccordion-icon{{#if card.isExpanded}} HitchhikerFaqAccordion-icon--expanded{{/if}}">
{{> icons/builtInIcon iconName='chevron' }}
</div>
</button>
<div class="HitchhikerFaqAccordion-content js-HitchhikerFaqAccordion-content"
Expand Down Expand Up @@ -61,13 +59,15 @@
{{#if showExcessDetailsToggle}}
<button class="HitchhikerCard-detailsToggle js-HitchhikerCard-detailsToggle">
{{card.showMoreDetails.showMoreText}}
<span data-component="IconComponent"
data-opts='{ "iconName": "chevron", "classNames": "Icon--sm Icon-collapseDown" }'></span>
<span>
{{> icons/builtInIcon iconName='chevron' classNames='Icon--sm Icon--collapseDown' }}
</span>
</button>
<button class="HitchhikerCard-detailsToggle js-HitchhikerCard-detailsToggle js-hidden">
{{card.showMoreDetails.showLessText}}
<span data-component="IconComponent"
data-opts='{ "iconName": "chevron", "classNames": "Icon--sm Icon-collapseUp" }'></span>
<span>
{{> icons/builtInIcon iconName='chevron' classNames='Icon--sm Icon--collapseUp' }}
</span>
</button>
{{/if}}
</div>
Expand All @@ -83,10 +83,11 @@
{{#if ariaLabel}}aria-label="{{ariaLabel}}"{{/if}}>
{{#if (any iconName iconUrl)}}
<div class="HitchhikerCTA-iconWrapper">
<div class="HitchhikerCTA-icon" data-component="IconComponent" data-opts='{
"iconUrl": "{{#if iconUrl}}{{#unless (isNonRelativeUrl iconUrl)}}{{@root.relativePath}}/{{/unless}}{{iconUrl}}{{/if}}",
"iconName": "{{iconName}}"
}'>
<div class="HitchhikerCTA-icon">
{{> icons/iconPartial
iconName=iconName
iconUrl=(relativePathHandler url=iconUrl relativePath=@root.relativePath)
}}
</div>
</div>
{{/if}}
Expand Down
19 changes: 11 additions & 8 deletions cards/financial-professional-location/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,15 @@
{{#if showExcessDetailsToggle}}
<button class="HitchhikerCard-detailsToggle js-HitchhikerCard-detailsToggle">
{{card.showMoreDetails.showMoreText}}
<span data-component="IconComponent"
data-opts='{ "iconName": "chevron", "classNames": "Icon--sm Icon-collapseDown" }'></span>
<span>
{{> icons/builtInIcon iconName='chevron' classNames='Icon--sm Icon--collapseDown' }}
</span>
</button>
<button class="HitchhikerCard-detailsToggle js-HitchhikerCard-detailsToggle js-hidden">
{{card.showMoreDetails.showLessText}}
<span data-component="IconComponent"
data-opts='{ "iconName": "chevron", "classNames": "Icon--sm Icon-collapseUp" }'></span>
<span>
{{> icons/builtInIcon iconName='chevron' classNames='Icon--sm Icon--collapseUp' }}
</span>
</button>
{{/if}}
</div>
Expand Down Expand Up @@ -172,10 +174,11 @@
{{#if ariaLabel}}aria-label="{{ariaLabel}}"{{/if}}>
{{#if (any iconName iconUrl)}}
<div class="HitchhikerCTA-iconWrapper">
<div class="HitchhikerCTA-icon" data-component="IconComponent" data-opts='{
"iconUrl": "{{iconUrl}}",
"iconName": "{{iconName}}"
}'>
<div class="HitchhikerCTA-icon">
{{> icons/iconPartial
iconName=iconName
iconUrl=(relativePathHandler url=iconUrl relativePath=@root.relativePath)
}}
</div>
</div>
{{/if}}
Expand Down
20 changes: 12 additions & 8 deletions cards/job-standard/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,15 @@
{{#if showExcessDetailsToggle}}
<button class="HitchhikerCard-detailsToggle js-HitchhikerCard-detailsToggle">
{{card.showMoreDetails.showMoreText}}
<span data-component="IconComponent"
data-opts='{ "iconName": "chevron", "classNames": "Icon--sm Icon-collapseDown" }'></span>
<span>
{{> icons/builtInIcon iconName='chevron' classNames='Icon--sm Icon--collapseDown' }}
</span>
</button>
<button class="HitchhikerCard-detailsToggle js-HitchhikerCard-detailsToggle js-hidden">
{{card.showMoreDetails.showLessText}}
<span data-component="IconComponent"
data-opts='{ "iconName": "chevron", "classNames": "Icon--sm Icon-collapseUp" }'></span>
<span>
{{> icons/builtInIcon iconName='chevron' classNames='Icon--sm Icon--collapseUp' }}
</span>
</button>
{{/if}}
</div>
Expand All @@ -96,10 +98,12 @@
{{#if ariaLabel}}aria-label="{{ariaLabel}}"{{/if}}>
{{#if (any iconName iconUrl)}}
<div class="HitchhikerCTA-iconWrapper">
<div class="HitchhikerCTA-icon" data-component="IconComponent" data-opts='{
"iconUrl": "{{#if iconUrl}}{{#unless (isNonRelativeUrl iconUrl)}}{{@root.relativePath}}/{{/unless}}{{iconUrl}}{{/if}}",
"iconName": "{{iconName}}"
}'></div>
<div class="HitchhikerCTA-icon">
{{> icons/iconPartial
iconName=iconName
iconUrl=(relativePathHandler url=iconUrl relativePath=@root.relativePath)
}}
</div>
</div>
{{/if}}
<div class='HitchhikerCTA-iconLabel'>
Expand Down
20 changes: 7 additions & 13 deletions cards/link-standard/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
data-eventoptions='{{json card.titleEventOptions}}'
target={{#if card.target}}"{{card.target}}"{{else}}"_top"{{/if}}>
{{{card.title}}}
{{> chevron_icon }}
{{> icons/builtInIcon iconName='chevron'}}
</a>
{{else}}
{{{card.title}}}
Expand All @@ -27,14 +27,6 @@
{{/if}}
{{/inline}}

{{#*inline 'chevron_icon'}}
<svg viewBox="0 0 7 9" xmlns="http://www.w3.org/2000/svg">
<g transform="translate(-1 -8)">
<path d="m2.6417004 8-1.1417004 1.0575 3.70850202 3.4425-3.70850202 3.4425 1.1417004 1.0575 4.8582996-4.5z"></path>
</g>
</svg>
{{/inline}}

{{#*inline 'subtitle'}}
{{#if card.subtitle}}
<div class="HitchhikerLinkStandard-subtitle">
Expand Down Expand Up @@ -62,13 +54,15 @@
{{#if showExcessDetailsToggle}}
<button class="HitchhikerCard-detailsToggle js-HitchhikerCard-detailsToggle">
{{card.showMoreDetails.showMoreText}}
<span data-component="IconComponent"
data-opts='{ "iconName": "chevron", "classNames": "Icon--sm Icon-collapseDown" }'></span>
<span>
{{> icons/builtInIcon iconName='chevron' classNames='Icon--sm Icon--collapseDown' }}
</span>
</button>
<button class="HitchhikerCard-detailsToggle js-HitchhikerCard-detailsToggle js-hidden">
{{card.showMoreDetails.showLessText}}
<span data-component="IconComponent"
data-opts='{ "iconName": "chevron", "classNames": "Icon--sm Icon-collapseUp" }'></span>
<span>
{{> icons/builtInIcon iconName='chevron' classNames='Icon--sm Icon--collapseUp' }}
</span>
</button>
{{/if}}
</div>
Expand Down
19 changes: 11 additions & 8 deletions cards/location-standard/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,11 @@
{{#if ariaLabel}}aria-label="{{ariaLabel}}"{{/if}}>
{{#if (any iconName iconUrl)}}
<div class="HitchhikerCTA-iconWrapper">
<div class="HitchhikerCTA-icon" data-component="IconComponent" data-opts='{
"iconUrl": "{{#if iconUrl}}{{#unless (isNonRelativeUrl iconUrl)}}{{@root.relativePath}}/{{/unless}}{{iconUrl}}{{/if}}",
"iconName": "{{iconName}}"
}'>
<div class="HitchhikerCTA-icon">
{{> icons/iconPartial
iconName=iconName
iconUrl=(relativePathHandler url=iconUrl relativePath=@root.relativePath)
}}
</div>
</div>
{{/if}}
Expand Down Expand Up @@ -185,13 +186,15 @@
{{#if showExcessDetailsToggle}}
<button class="HitchhikerCard-detailsToggle js-HitchhikerCard-detailsToggle">
{{card.showMoreDetails.showMoreText}}
<span data-component="IconComponent"
data-opts='{ "iconName": "chevron", "classNames": "Icon--sm Icon-collapseDown" }'></span>
<span>
{{> icons/builtInIcon iconName='chevron' classNames='Icon--sm Icon--collapseDown' }}
</span>
</button>
<button class="HitchhikerCard-detailsToggle js-HitchhikerCard-detailsToggle js-hidden">
{{card.showMoreDetails.showLessText}}
<span data-component="IconComponent"
data-opts='{ "iconName": "chevron", "classNames": "Icon--sm Icon-collapseUp" }'></span>
<span>
{{> icons/builtInIcon iconName='chevron' classNames='Icon--sm Icon--collapseUp' }}
</span>
</button>
{{/if}}
</div>
Expand Down
19 changes: 11 additions & 8 deletions cards/menuitem-standard/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,15 @@
{{#if showExcessDetailsToggle}}
<button class="HitchhikerCard-detailsToggle js-HitchhikerCard-detailsToggle">
{{card.showMoreDetails.showMoreText}}
<span data-component="IconComponent"
data-opts='{ "iconName": "chevron", "classNames": "Icon--sm Icon-collapseDown" }'></span>
<span>
{{> icons/builtInIcon iconName='chevron' classNames='Icon--sm Icon--collapseDown' }}
</span>
</button>
<button class="HitchhikerCard-detailsToggle js-HitchhikerCard-detailsToggle js-hidden">
{{card.showMoreDetails.showLessText}}
<span data-component="IconComponent"
data-opts='{ "iconName": "chevron", "classNames": "Icon--sm Icon-collapseUp" }'></span>
<span>
{{> icons/builtInIcon iconName='chevron' classNames='Icon--sm Icon--collapseUp' }}
</span>
</button>
{{/if}}
</div>
Expand All @@ -116,10 +118,11 @@
{{#if ariaLabel}}aria-label="{{ariaLabel}}"{{/if}}>
{{#if (any iconName iconUrl)}}
<div class="HitchhikerCTA-iconWrapper">
<div class="HitchhikerCTA-icon" data-component="IconComponent" data-opts='{
"iconUrl": "{{#if iconUrl}}{{#unless (isNonRelativeUrl iconUrl)}}{{@root.relativePath}}/{{/unless}}{{iconUrl}}{{/if}}",
"iconName": "{{iconName}}"
}'>
<div class="HitchhikerCTA-icon">
{{> icons/iconPartial
iconName=iconName
iconUrl=(relativePathHandler url=iconUrl relativePath=@root.relativePath)
}}
</div>
</div>
{{/if}}
Expand Down
19 changes: 11 additions & 8 deletions cards/multilang-event-standard/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,15 @@
{{#if showExcessDetailsToggle}}
<button class="HitchhikerCard-detailsToggle js-HitchhikerCard-detailsToggle">
{{card.showMoreDetails.showMoreText}}
<span data-component="IconComponent"
data-opts='{ "iconName": "chevron", "classNames": "Icon--sm Icon-collapseDown" }'></span>
<span>
{{> icons/builtInIcon iconName='chevron' classNames='Icon--sm Icon--collapseDown' }}
</span>
</button>
<button class="HitchhikerCard-detailsToggle js-HitchhikerCard-detailsToggle js-hidden">
{{card.showMoreDetails.showLessText}}
<span data-component="IconComponent"
data-opts='{ "iconName": "chevron", "classNames": "Icon--sm Icon-collapseUp" }'></span>
<span>
{{> icons/builtInIcon iconName='chevron' classNames='Icon--sm Icon--collapseUp' }}
</span>
</button>
{{/if}}
</div>
Expand All @@ -95,10 +97,11 @@
{{#if ariaLabel}}aria-label="{{ariaLabel}}"{{/if}}>
{{#if (any iconName iconUrl)}}
<div class="HitchhikerCTA-iconWrapper">
<div class="HitchhikerCTA-icon" data-component="IconComponent" data-opts='{
"iconUrl": "{{#if iconUrl}}{{#unless (isNonRelativeUrl iconUrl)}}{{@root.relativePath}}/{{/unless}}{{iconUrl}}{{/if}}",
"iconName": "{{iconName}}"
}'>
<div class="HitchhikerCTA-icon">
{{> icons/iconPartial
iconName=iconName
iconUrl=(relativePathHandler url=iconUrl relativePath=@root.relativePath)
}}
</div>
</div>
{{/if}}
Expand Down
Loading

0 comments on commit dcb256a

Please sign in to comment.