fix: Release Candidate - v4.31.1 (Hotfix) (#412)

* fix: add missing translations and fix parsability --------- Co-authored-by: Conventional Changelog Action <[email protected]>
jwplayer · Nov 30, 2023 · b618efa · b618efa
1 parent d7e79b9
commit b618efa
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 9 deletions.
diff --git a/.github/workflows/release-create-release-candidate-branch.yml b/.github/workflows/release-create-release-candidate-branch.yml
@@ -17,19 +17,19 @@ jobs:
           ref: release
       # It would be easier to create the branch from develop,
       # but unfortunately the script that creates the PR's only considers commits added during the action run
-      - name: Merge latest from develop
+      - name: Merge latest from target branch
         run: |
           git config --global user.name 'Release Script'
           git config --global user.email '[email protected]'
-          git fetch origin develop
-          git merge origin/develop
+          git fetch origin ${{ github.ref_name }}
+          git merge origin/${{ github.ref_name }}
           yarn && yarn i18next
         env:
           GITHUB_TOKEN: ${{ secrets.ACTION_TOKEN }}
 
       - name: Generate changelog
         id: changelog
-        uses: TriPSs/conventional-changelog-action@v3
+        uses: TriPSs/conventional-changelog-action@v4.1.1
         with:
           github-token: ${{ secrets.ACTION_TOKEN }}
           release-count: 0
@@ -43,8 +43,8 @@ jobs:
         uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ secrets.ACTION_TOKEN }}
-          title: ${{ steps.changelog.outputs.tag }} Release Candidate
+          title:  Release Candidate - ${{ steps.changelog.outputs.tag }}${{ github.ref_name != 'develop' && ' (Hotfix)' || ''}}
           base: release
-          branch: release-candidate
+          branch: ${{ github.ref_name == 'develop' && 'release-candidate' || 'hotfix-release-candidate' }}
           body: ${{ steps.changelog.outputs.clean_changelog }}
-          labels: release-candidate
+          labels: ${{github.ref_name == 'develop' && 'release-candidate' || 'release-candidate,hotfix'}}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [4.31.1](https://github.com/jwplayer/ott-web-app/compare/v4.31.0...v4.31.1) (2023-11-28)
+
+
+### Bug Fixes
+
+* add missing translations and fix parsability ([09548a5](https://github.com/jwplayer/ott-web-app/commit/09548a51001f559cb7baef84b73b9ae9bb8346c5))
+
 ## [4.31.0](https://github.com/jwplayer/ott-web-app/compare/v4.30.0...v4.31.0) (2023-11-13)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jw-ott-webapp",
-  "version": "4.31.0",
+  "version": "4.31.1",
   "main": "index.js",
   "repository": "https://github.com/jwplayer/ott-web-app.git",
   "author": "JW Player",

diff --git a/public/locales/en/account.json b/public/locales/en/account.json
@@ -153,6 +153,8 @@
     },
     "sign_up": "Sign up",
     "terms_and_conditions": "Terms and Conditions",
+    "terms_consent": "I accept the {{termsLink}}.",
+    "terms_consent_jwplayer": "I accept the {{termsLink}} of JW Player.",
     "user_exists": "There is already a user with this email address",
     "view_password": "View password"
   },

diff --git a/public/locales/es/account.json b/public/locales/es/account.json
@@ -163,6 +163,8 @@
     },
     "sign_up": "Registrarse",
     "terms_and_conditions": "Términos y condiciones",
+    "terms_consent": "Acepto los {{termsLink}}.",
+    "terms_consent_jwplayer": "Acepto los {{termsLink}} de JW Player.",
     "user_exists": "Ya existe un usuario con esta dirección de correo electrónico",
     "view_password": "Ver contraseña"
   },

diff --git a/src/services/inplayer.account.service.ts b/src/services/inplayer.account.service.ts
@@ -499,7 +499,7 @@ function getTermsConsent({ label: termsUrl }: RegisterField): Consent {
     isCustomRegisterField: true,
     required: true,
     name: 'terms',
-    label: i18next.t(`account:registration.${termsUrl ? 'terms_consent' : 'terms_consent_jwplayer'}`, { termsLink }),
+    label: termsUrl ? i18next.t('account:registration.terms_consent', { termsLink }) : i18next.t('account:registration.terms_consent_jwplayer', { termsLink }),
     enabledByDefault: false,
     placeholder: '',
     options: {},