Skip to content

Commit

Permalink
Merge branch 'art/dev' into art/bump-2025.1.0
Browse files Browse the repository at this point in the history
Signed-off-by: c30 <43949163+Zel9278@users.noreply.github.com>
  • Loading branch information
Zel9278 authored Jan 28, 2025
2 parents a42db19 + 7a2829a commit a2fb816
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
6 changes: 1 addition & 5 deletions locales/fr-FR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1588,11 +1588,7 @@ _achievements:
description: "Vous vous êtes connecté à la date de votre anniversaire"
_loggedInOnNewYearsDay:
title: "Bonne année !"
description: "Vous vous êtes connecté le premier jour de l'année"
flavor: "Merci pour le soutient continue sur cette instance."
_cookieClicked:
title: "Jeu de clic sur des cookies"
description: "Cliqué sur un cookie"
_puddingClicked:
flavor: "Attendez une minute, vous êtes sur le mauvais site web ?"
_brainDiver:
title: "Brain Diver"
Expand Down
4 changes: 2 additions & 2 deletions locales/zh-CN.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1714,8 +1714,8 @@ _achievements:
title: "恭贺新禧"
description: "在元旦登入"
flavor: "今年也请对本服务器多多指教!"
_cookieClicked:
title: "饼干点点乐"
_puddingClicked:
title: "点击饼干小游戏"
description: "点击了饼干"
flavor: "穿越了?"
_brainDiver:
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/src/ui/_common_/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
*/

import { defineAsyncComponent } from 'vue';
import { host } from '@@/js/config.js';
import type { MenuItem } from '@/types/menu.js';
import * as os from '@/os.js';
import { instance } from '@/instance.js';
import { host } from '@@/js/config.js';
import { i18n } from '@/i18n.js';
import { $i } from '@/account.js';

Expand All @@ -25,7 +25,7 @@ function toolsMenuItems(): MenuItem[] {
}, {
type: 'link',
to: '/clicker',
text: '🍪👈',
text: '🍮👈',
icon: 'ti ti-cookie',
}, ($i && ($i.isAdmin || $i.policies.canManageCustomEmojis)) ? {
type: 'link',
Expand Down

0 comments on commit a2fb816

Please sign in to comment.