chore: update browserslist

.github/workflows/update-browserlist.yml

@@ -11,31 +11,34 @@ jobs:
       matrix:
         node: [16]
         npm: [8.5.x]
-
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
-      with:
-        node-version: ${{ matrix.node }}
-    - run: npm install -g npm@${{ matrix.npm }}
-    - run: make requirements
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
+      - run: npm install -g npm@${{ matrix.npm }}
+      - run: make requirements
+      - name: Update dependencies
+        run: npx update-browserslist-db@latest
+      - name: Create Pull Request
+        id: cpr
+        uses: peter-evans/create-pull-request@v4.1.1
+        with:
+            token: ${{ secrets.requirements_bot_github_token }}
+            commit-message: 'chore: update browserslist'
+            title: Update browserslist
+            body: |
+              - Dependency updates
+  
+              Auto-generated by [create-pull-request][1]
+  
+              [1]: https://github.com/peter-evans/create-pull-request
+            branch: update-browserslist
 
-    - name: Update dependencies
-      run: npx browserslist@latest --update-db
-
-    - name: setup testeng-ci
-      run: |
-        git clone https://github.com/edx/testeng-ci.git
-        cd $GITHUB_WORKSPACE/testeng-ci
-        pip install -r requirements/base.txt
-    - name: create pull request
-      id: createpullrequest
-      env:
-        GITHUB_TOKEN: ${{ secrets.requirements_bot_github_token }}
-        GITHUB_USER_EMAIL: ${{ secrets.requirements_bot_github_email }}
-      run: |
-        cd $GITHUB_WORKSPACE/testeng-ci
-        python -m jenkins.pull_request_creator --repo-root=$GITHUB_WORKSPACE \
-        --target-branch="master" --base-branch-name="update-browserslist" \
-        --commit-message="chore: update browserslist" --pr-title="Update browserslist DB" \
-        --pr-body="Updated browserlist DB" --delete-old-pull-requests --output-pr-url-for-github-action
+      - name: Enable Pull Request Automerge
+        if: steps.cpr.outputs.pull-request-operation == 'created'
+        uses: peter-evans/enable-pull-request-automerge@v2
+        with:
+          token: ${{ secrets.requirements_bot_github_token }}
+          pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
+          merge-method: squash

src/account-settings/BetaLanguageBanner.jsx

@@ -49,9 +49,6 @@ class BetaLanguageBanner extends React.Component {
 
   render() {
     const savedLanguage = this.getSiteLanguageEntry(this.context.locale);
-    if (!savedLanguage) {
-      return null;
-    }
     const isSavedLanguageReleased = savedLanguage.released === true;
     const noPreviousLanguageSet = this.props.siteLanguage.previousValue === null;
     if (isSavedLanguageReleased || noPreviousLanguageSet) {

src/account-settings/site-language/constants.js

@@ -69,31 +69,6 @@ const siteLanguageList = [
     name: '中文 (简体)',
     released: true,
   },
-  {
-    code: 'pt',
-    name: 'Português',
-    released: true,
-  },
-  {
-    code: 'it',
-    name: 'Italian',
-    released: true,
-  },
-  {
-    code: 'de',
-    name: 'German',
-    released: true,
-  },
-  {
-    code: 'hi',
-    name: 'Hindi',
-    released: true,
-  },
-  {
-    code: 'fr-ca',
-    name: 'French (CA)',
-    released: true,
-  },
 ];
 
 export default siteLanguageList;