Merge branch 'main' of https://github.com/glitch-soc/mastodon

2023-07-24 14:05:38 +09:00 · 2023-07-24 14:05:38 +09:00 · a52fafba6e
commit a52fafba6e
parent a6a42473c2 cf9affdeac
7 changed files with 28 additions and 25 deletions
--- a/app/javascript/flavours/glitch/features/local_settings/navigation/item/index.jsx
+++ b/app/javascript/flavours/glitch/features/local_settings/navigation/item/index.jsx
@ -58,16 +58,14 @@ export default class LocalSettingsPage extends PureComponent {
      </a>
    );
    else if (onNavigate) return (
-      <a
+      <button
        onClick={handleClick}
-        role='button'
-        tabIndex={0}
        className={finalClassName}
        title={title}
        aria-label={title}
      >
        {iconElem} <span>{title}</span>
-      </a>
+      </button>
    );
    else return null;
  }
--- a/app/javascript/flavours/glitch/features/ui/components/doodle_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/doodle_modal.jsx
@ -129,12 +129,12 @@ const mapStateToProps = state => ({
 const mapDispatchToProps = dispatch => ({
  /**
   * Set options in the redux store
-   * @param opts
+   * @param {Object} opts
   */
  setOpt: (opts) => dispatch(doodleSet(opts)),
  /**
   * Submit doodle for upload
-   * @param file
+   * @param {File} file
   */
  submit: (file) => dispatch(uploadCompose([file])),
 });
@ -240,7 +240,7 @@ class DoodleModal extends ImmutablePureComponent {

  /**
   * Key up handler
-   * @param e
+   * @param {KeyboardEvent} e
   */
  handleKeyUp = (e) => {
    if (e.target.nodeName === 'INPUT') return;
@ -269,7 +269,7 @@ class DoodleModal extends ImmutablePureComponent {

  /**
   * Key down handler
-   * @param e
+   * @param {KeyboardEvent} e
   */
  handleKeyDown = (e) => {
    if (e.key === 'Control' || e.key === 'Meta') {
@ -306,7 +306,7 @@ class DoodleModal extends ImmutablePureComponent {
  /**
   * Set reference to the canvas element.
   * This is called during component init
-   * @param elem - canvas element
+   * @param {HTMLCanvasElement} elem - canvas element
   */
  setCanvasRef = (elem) => {
    this.canvas = elem;
@ -347,7 +347,7 @@ class DoodleModal extends ImmutablePureComponent {

  /**
   * Set up the sketcher instance
-   * @param canvas - canvas element. Null if we're just resizing
+   * @param {HTMLCanvasElement | null} canvas - canvas element. Null if we're just resizing
   */
  initSketcher (canvas = null) {
    const sizepreset = DOODLE_SIZES[this.size];
@ -445,7 +445,7 @@ class DoodleModal extends ImmutablePureComponent {
  /**
   * Palette left click.
   * Selects Fg color (or Bg, if Control/Meta is held)
-   * @param e - event
+   * @param {MouseEvent<HTMLButtonElement>} e - event
   */
  onPaletteClick = (e) => {
    const c = e.target.dataset.color;
@ -463,7 +463,7 @@ class DoodleModal extends ImmutablePureComponent {
  /**
   * Palette right click.
   * Selects Bg color
-   * @param e - event
+   * @param {MouseEvent<HTMLButtonElement>} e - event
   */
  onPaletteRClick = (e) => {
    this.bg = e.target.dataset.color;
@ -473,7 +473,7 @@ class DoodleModal extends ImmutablePureComponent {

  /**
   * Handle click on the Draw mode button
-   * @param e - event
+   * @param {MouseEvent<HTMLButtonElement>} e - event
   */
  setModeDraw = (e) => {
    this.mode = 'draw';
@ -482,7 +482,7 @@ class DoodleModal extends ImmutablePureComponent {

  /**
   * Handle click on the Fill mode button
-   * @param e - event
+   * @param {MouseEvent<HTMLButtonElement>} e - event
   */
  setModeFill = (e) => {
    this.mode = 'fill';
@ -491,7 +491,7 @@ class DoodleModal extends ImmutablePureComponent {

  /**
   * Handle click on Smooth checkbox
-   * @param e - event
+   * @param {ChangeEvent<HTMLInputElement>} e - event
   */
  tglSmooth = (e) => {
    this.smoothing = !this.smoothing;
@ -500,7 +500,7 @@ class DoodleModal extends ImmutablePureComponent {

  /**
   * Handle click on Adaptive checkbox
-   * @param e - event
+   * @param {ChangeEvent<HTMLInputElement>} e - event
   */
  tglAdaptive = (e) => {
    this.adaptiveStroke = !this.adaptiveStroke;
@ -509,7 +509,7 @@ class DoodleModal extends ImmutablePureComponent {

  /**
   * Handle change of the Weight input field
-   * @param e - event
+   * @param {ChangeEvent<HTMLInputElement>} e - event
   */
  setWeight = (e) => {
    this.weight = +e.target.value || 1;
@ -517,7 +517,7 @@ class DoodleModal extends ImmutablePureComponent {

  /**
   * Set size - clalback from the select box
-   * @param e - event
+   * @param {ChangeEvent<HTMLSelectElement>} e - event
   */
  changeSize = (e) => {
    let newSize = e.target.value;
--- a/app/javascript/flavours/glitch/locales/zh-CN.json
+++ b/app/javascript/flavours/glitch/locales/zh-CN.json
@ -50,7 +50,7 @@
  "content-type.change": "内容类型 ",
  "direct.group_by_conversations": "按对话分组",
  "empty_column.follow_recommendations": "似乎无法为你生成任何建议。你可以尝试使用搜索寻找你可能知道的人或探索热门标签。",
-  "endorsed_accounts_editor.endorsed_accounts": "精选帐户",
+  "endorsed_accounts_editor.endorsed_accounts": "精选账户",
  "favourite_modal.combo": "下次你可以按 {combo} 跳过这个",
  "firehose.column_settings.allow_local_only": "在“全部”中显示仅本站可见的嘟文",
  "follow_recommendations.done": "完成",
@ -65,7 +65,7 @@
  "keyboard_shortcuts.secondary_toot": "使用另一隐私设置发送嘟文",
  "keyboard_shortcuts.toggle_collapse": "折叠或展开嘟文",
  "media_gallery.sensitive": "敏感内容",
-  "moved_to_warning": "此帐户已被标记为移至 {moved_to_link}，并且似乎没有收到新粉丝。",
+  "moved_to_warning": "此账户已被标记为移至 {moved_to_link}，并且似乎没有收到新粉丝。",
  "navigation_bar.app_settings": "应用设置",
  "navigation_bar.featured_users": "推荐用户",
  "navigation_bar.keyboard_shortcuts": "键盘快捷键",
@ -168,7 +168,7 @@
  "settings.show_reply_counter": "显示回复的大致数量",
  "settings.side_arm": "辅助发嘟按钮：",
  "settings.side_arm.none": "无",
-  "settings.side_arm_reply_mode": "当回复嘟文时，辅助发嘟按钮会：",
+  "settings.side_arm_reply_mode": "当回复嘟文时，另一发嘟按钮会：",
  "settings.side_arm_reply_mode.copy": "复制被回复嘟文的隐私设置",
  "settings.side_arm_reply_mode.keep": "保留辅助发嘟按钮以设置隐私",
  "settings.side_arm_reply_mode.restrict": "将隐私设置限制为正在回复的那条嘟文",
--- a/app/javascript/flavours/glitch/styles/components/accounts.scss
+++ b/app/javascript/flavours/glitch/styles/components/accounts.scss
@ -319,7 +319,7 @@
  color: $white;
  margin-bottom: 4px;
  display: block;
-  background-color: $base-overlay-background;
+  background-color: rgba($black, 0.45);
  text-transform: uppercase;
  font-size: 11px;
  font-weight: 500;
--- a/app/javascript/flavours/glitch/styles/components/local_settings.scss
+++ b/app/javascript/flavours/glitch/styles/components/local_settings.scss
@ -56,15 +56,21 @@
  padding: 15px 20px;
  color: inherit;
  background: lighten($ui-secondary-color, 8%);
+  border: 0;
  border-bottom: 1px $ui-secondary-color solid;
  cursor: pointer;
  text-decoration: none;
  outline: none;
  transition: background 0.3s;
+  box-sizing: border-box;
+  width: 100%;
+  text-align: start;
+  font-size: inherit;

  .text-icon-button {
    color: inherit;
    transition: unset;
+    unicode-bidi: embed;
  }

  &:hover {
--- a/app/javascript/flavours/glitch/styles/components/status.scss
+++ b/app/javascript/flavours/glitch/styles/components/status.scss
@ -175,8 +175,7 @@

 .notif-cleaning {
  .status,
-  .notification-follow,
-  .notification-follow-request {
+  .notification {
    padding-inline-end: ($dismiss-overlay-width + 0.5rem);
  }
 }
--- a/config/locales-glitch/zh-CN.yml
+++ b/config/locales-glitch/zh-CN.yml
@ -7,7 +7,7 @@ zh-CN:
    settings:
      captcha_enabled:
        desc_html: 这依赖于来自hCaptcha的外部脚本，这可能是一个安全和隐私问题。 此外， <strong>这可能使得某些人(尤其是残疾人)</strong>的注册简单程度大幅减少。 出于这些原因，请考虑采取其他措施，例如基于审核或邀请的注册。<br>通过限定邀请链接注册的用户将不需要解决验证码问题
-        title: 要求新用户解决验证码以确认他们的帐户
+        title: 要求新用户解决验证码以确认他们的账户
      flavour_and_skin:
        title: 风格与皮肤
      hide_followers_count: