Merge pull request github#12947 from github/repo-sync

repo sync
SHAHZEBali0000 · Dec 13, 2021 · 8b80477 · 8b80477
2 parents 613de1c + 1c0881a
commit 8b80477
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 94 deletions.
diff --git a/.github/allowed-actions.js b/.github/allowed-actions.js
@@ -13,7 +13,6 @@ export default [
   'actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074', // v2.2.4
   'alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488', // v0.8.1
   'andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90', // v1.0.4
-  'crowdin/github-action@d0622816ed4f4744db27d04374b2cef6867f7bed', // v1.4.1
   'cschleiden/actions-linter@caffd707beda4fc6083926a3dff48444bc7c24aa', // uses github-actions-parser v0.23.0
   'dawidd6/action-delete-branch@47743101a121ad657031e6704086271ca81b1911', // v3.0.2
   'dawidd6/action-download-artifact@af92a8455a59214b7b932932f2662fdefbd78126', // v2.15.0

diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml
diff --git a/components/ui/ScrollButton/ScrollButton.tsx b/components/ui/ScrollButton/ScrollButton.tsx
@@ -1,6 +1,7 @@
 import { useState, useEffect } from 'react'
 import cx from 'classnames'
 import { ChevronUpIcon } from '@primer/octicons-react'
+import { useTranslation } from '../../hooks/useTranslation'
 
 export type ScrollButtonPropsT = {
   className?: string
@@ -9,6 +10,7 @@ export type ScrollButtonPropsT = {
 
 export const ScrollButton = ({ className, ariaLabel }: ScrollButtonPropsT) => {
   const [show, setShow] = useState(false)
+  const { t } = useTranslation(['scroll_button'])
 
   useEffect(() => {
     // show scroll button only when view is scrolled down
@@ -35,9 +37,13 @@ export const ScrollButton = ({ className, ariaLabel }: ScrollButtonPropsT) => {
     <div className={cx(className, 'transition-200', show ? 'opacity-100' : 'opacity-0')}>
       <button
         onClick={onClick}
-        className={cx(
-          'tooltipped tooltipped-n tooltipped-no-delay color-bg-accent-emphasis color-fg-on-emphasis circle border-0'
-        )}
+        className="color-bg-default color-fg-on-emphasis border-0 d-inline-block mr-2 f6"
+      >
+        {t('scroll_to_top')}
+      </button>
+      <button
+        onClick={onClick}
+        className={cx('color-bg-accent-emphasis color-fg-on-emphasis circle border-0')}
         style={{ width: 40, height: 40 }}
         aria-label={ariaLabel}
       >