Merge pull request #1526 from h3poteto/feat/emoji-picker-locale

refs #1375 Set locale for emoji picker
h3poteto · Jul 5, 2024 · 35674a8 · 35674a8
2 parents 4e4e2b1 + d3247ee
commit 35674a8
Show file tree

Hide file tree

Showing 20 changed files with 93 additions and 6 deletions.
diff --git a/src/components/compose/Compose.tsx b/src/components/compose/Compose.tsx
@@ -39,6 +39,7 @@ export const renderAccountIcon = (props: any, ref: any, account: [Account, Serve
 type Props = {
  setOpened: (value: boolean) => void
  servers: Array<ServerSet>
+ locale: string
 }
 
 const Compose: React.FC<Props> = props => {
@@ -127,6 +128,7 @@ const Compose: React.FC<Props> = props => {
  defaultVisibility={defaultVisibility}
  defaultNSFW={defaultNSFW}
  defaultLanguage={defaultLanguage}
+ locale={props.locale}
  />
  )}
  </Content>

diff --git a/src/components/compose/Status.tsx b/src/components/compose/Status.tsx
@@ -56,6 +56,7 @@ type Props = {
  defaultNSFW?: boolean
  defaultLanguage?: string | null
  onClose?: () => void
+ locale: string
 }
 
 type FormValue = {
@@ -425,6 +426,8 @@ const Status: React.FC<Props> = props => {
  setFormValue(current => Object.assign({}, current, { spoiler: '' }))
  }
 
+ const simpleLocale = props.locale ? props.locale.split('-')[0] : 'en'
+
  const EmojiPicker = forwardRef<HTMLDivElement>((props, ref) => (
  <Popover ref={ref} {...props}>
  <Picker
@@ -435,6 +438,7 @@ const Status: React.FC<Props> = props => {
  set="native"
  perLine="7"
  theme={theme === 'high-contrast' ? 'dark' : theme}
+ locale={simpleLocale}
  />
  </Popover>
  ))

diff --git a/src/components/detail/Detail.tsx b/src/components/detail/Detail.tsx
@@ -17,6 +17,7 @@ type Props = {
  openFromOtherAccount: (status: Entity.Status) => void
  openListMemberships: (list: Entity.List, client: MegalodonInterface) => void
  openAddListMember: (user: Entity.Account, client: MegalodonInterface) => void
+ locale: string
 }
 
 const Detail: React.FC<Props> = props => {
@@ -59,6 +60,7 @@ const Detail: React.FC<Props> = props => {
  }
  openReport={props.openReport}
  openFromOtherAccount={props.openFromOtherAccount}
+ locale={props.locale}
  />
  )}
  {target === 'profile' && (
@@ -67,14 +69,25 @@ const Detail: React.FC<Props> = props => {
  openReport={props.openReport}
  openFromOtherAccount={props.openFromOtherAccount}
  openAddListMember={props.openAddListMember}
+ locale={props.locale}
  />
  )}
  {target === 'tag' && (
- <TagDetail openMedia={props.openMedia} openReport={props.openReport} openFromOtherAccount={props.openFromOtherAccount} />
+ <TagDetail
+ openMedia={props.openMedia}
+ openReport={props.openReport}
+ openFromOtherAccount={props.openFromOtherAccount}
+ locale={props.locale}
+ />
  )}
  {target === 'lists' && <ListsDetail openListMemberships={props.openListMemberships} />}
  {target === 'list' && (
- <ListDetail openMedia={props.openMedia} openReport={props.openReport} openFromOtherAccount={props.openFromOtherAccount} />
+ <ListDetail
+ openMedia={props.openMedia}
+ openReport={props.openReport}
+ openFromOtherAccount={props.openFromOtherAccount}
+ locale={props.locale}
+ />
  )}
  {target === 'followed_hashtags' && <FollowedHashtags />}
  </Container>

diff --git a/src/components/detail/List.tsx b/src/components/detail/List.tsx
@@ -18,6 +18,7 @@ type Props = {
  openMedia: (media: Array<Entity.Attachment>, index: number) => void
  openReport: (status: Entity.Status, client: MegalodonInterface) => void
  openFromOtherAccount: (status: Entity.Status) => void
+ locale: string
 }
 
 export default function ListDetail(props: Props) {
@@ -169,6 +170,7 @@ export default function ListDetail(props: Props) {
  openFromOtherAccount={props.openFromOtherAccount}
  customEmojis={customEmojis}
  filters={filters}
+ locale={props.locale}
  />
  </List.Item>
  )}

diff --git a/src/components/detail/Profile.tsx b/src/components/detail/Profile.tsx
@@ -27,6 +27,7 @@ type Props = {
  openReport: (status: Entity.Status, client: MegalodonInterface) => void
  openFromOtherAccount: (status: Entity.Status) => void
  openAddListMember: (user: Entity.Account, client: MegalodonInterface) => void
+ locale: string
 }
 
 const Profile: React.FC<Props> = props => {
@@ -163,6 +164,7 @@ const Profile: React.FC<Props> = props => {
  openMedia={props.openMedia}
  openReport={props.openReport}
  openFromOtherAccount={props.openFromOtherAccount}
+ locale={props.locale}
  ref={postsRef}
  />
  )

diff --git a/src/components/detail/Status.tsx b/src/components/detail/Status.tsx
@@ -17,6 +17,7 @@ type Props = {
  openMedia: (media: Array<Entity.Attachment>, index: number) => void
  openReport: (status: Entity.Status, client: MegalodonInterface) => void
  openFromOtherAccount: (status: Entity.Status) => void
+ locale: string
 }
 
 const StatusDetail: React.FC<Props> = props => {
@@ -179,6 +180,7 @@ const StatusDetail: React.FC<Props> = props => {
  openReport={props.openReport}
  openFromOtherAccount={props.openFromOtherAccount}
  customEmojis={customEmojis}
+ locale={props.locale}
  />
  </List.Item>
  ))}

diff --git a/src/components/detail/Tag.tsx b/src/components/detail/Tag.tsx
@@ -18,6 +18,7 @@ type Props = {
  openMedia: (media: Array<Entity.Attachment>, index: number) => void
  openReport: (status: Entity.Status, client: MegalodonInterface) => void
  openFromOtherAccount: (status: Entity.Status) => void
+ locale: string
 }
 
 export default function TagDetail(props: Props) {
@@ -201,6 +202,7 @@ export default function TagDetail(props: Props) {
  openReport={props.openReport}
  openFromOtherAccount={props.openFromOtherAccount}
  customEmojis={customEmojis}
+ locale={props.locale}
  />
  </List.Item>
  )}

diff --git a/src/components/detail/profile/Posts.tsx b/src/components/detail/profile/Posts.tsx
@@ -21,6 +21,7 @@ type ArgProps = {
  openMedia: (media: Array<Entity.Attachment>, index: number) => void
  openReport: (status: Entity.Status, client: MegalodonInterface) => void
  openFromOtherAccount: (status: Entity.Status) => void
+ locale: string
 }
 
 const Posts: React.ForwardRefRenderFunction<FuncProps, ArgProps> = (props, ref) => {
@@ -122,6 +123,7 @@ const Posts: React.ForwardRefRenderFunction<FuncProps, ArgProps> = (props, ref)
  openReport={props.openReport}
  openFromOtherAccount={props.openFromOtherAccount}
  customEmojis={customEmojis}
+ locale={props.locale}
  />
  </List.Item>
  ))}
@@ -140,6 +142,7 @@ const Posts: React.ForwardRefRenderFunction<FuncProps, ArgProps> = (props, ref)
  openReport={props.openReport}
  openFromOtherAccount={props.openFromOtherAccount}
  customEmojis={customEmojis}
+ locale={props.locale}
  />
  </List.Item>
  ))}

diff --git a/src/components/fromOtherAccount/FromOtherAccount.tsx b/src/components/fromOtherAccount/FromOtherAccount.tsx
@@ -12,6 +12,7 @@ type Props = {
  opened: boolean
  status: Entity.Status
  close: () => void
+ locale: string
 }
 
 export default function FromOtherAccount(props: Props) {
@@ -54,6 +55,7 @@ export default function FromOtherAccount(props: Props) {
  reset()
  props.close()
  }}
+ locale={props.locale}
  />
  )
  }

diff --git a/src/components/fromOtherAccount/Status.tsx b/src/components/fromOtherAccount/Status.tsx
@@ -20,6 +20,7 @@ type Props = {
  account: Account
  client: MegalodonInterface | null
  next: () => void
+ locale: string
 }
 export default function Status(props: Props) {
  const [statuses, setStatuses] = useState<Array<Entity.Status>>([])
@@ -90,6 +91,7 @@ export default function Status(props: Props) {
  server={props.server}
  account={props.account}
  customEmojis={customEmojis}
+ locale={props.locale}
  />
  ))
  ) : (
@@ -115,6 +117,7 @@ type PostProps = {
  client: MegalodonInterface
  updateStatus: (status: Entity.Status) => void
  customEmojis: Array<CustomEmojiCategory>
+ locale: string
 }
 
 function Post(props: PostProps) {
@@ -173,13 +176,21 @@ function Post(props: PostProps) {
  setShowReply={setShowReply}
  updateStatus={props.updateStatus}
  customEmojis={props.customEmojis}
+ locale={props.locale}
  />
  </div>
  </FlexboxGrid.Item>
  </FlexboxGrid>
  {showReply && (
  <div style={{ padding: '8px 12px' }}>
- <Reply client={client} server={props.server} account={props.account} in_reply_to={status} onClose={() => setShowReply(false)} />
+ <Reply
+ client={client}
+ server={props.server}
+ account={props.account}
+ in_reply_to={status}
+ onClose={() => setShowReply(false)}
+ locale={props.locale}
+ />
  </div>
  )}
  </>

diff --git a/src/components/search/Results.tsx b/src/components/search/Results.tsx
@@ -19,6 +19,7 @@ type Props = {
  openMedia: (media: Array<Entity.Attachment>, index: number) => void
  openReport: (status: Entity.Status, client: MegalodonInterface) => void
  openFromOtherAccount: (status: Entity.Status) => void
+ locale: string
 }
 
 export default function Results(props: Props) {
@@ -184,6 +185,7 @@ export default function Results(props: Props) {
  openReport={props.openReport}
  openFromOtherAccount={props.openFromOtherAccount}
  customEmojis={customEmojis}
+ locale={props.locale}
  />
  </div>
  </List.Item>

diff --git a/src/components/search/Search.tsx b/src/components/search/Search.tsx
@@ -17,6 +17,7 @@ type Props = {
  openMedia: (media: Array<Entity.Attachment>, index: number) => void
  openReport: (status: Entity.Status, client: MegalodonInterface) => void
  openFromOtherAccount: (status: Entity.Status) => void
+ locale: string
 }
 
 export default function Search(props: Props) {
@@ -87,6 +88,7 @@ export default function Search(props: Props) {
  openMedia={props.openMedia}
  openReport={props.openReport}
  openFromOtherAccount={props.openFromOtherAccount}
+ locale={props.locale}
  />
  )}
  </Content>

diff --git a/src/components/timelines/Notifications.tsx b/src/components/timelines/Notifications.tsx
@@ -46,6 +46,7 @@ type Props = {
  openMedia: (media: Array<Entity.Attachment>, index: number) => void
  openReport: (status: Entity.Status, client: MegalodonInterface) => void
  openFromOtherAccount: (status: Entity.Status) => void
+ locale: string
 }
 
 const Notifications: React.FC<Props> = props => {
@@ -404,6 +405,7 @@ const Notifications: React.FC<Props> = props => {
  openFromOtherAccount={props.openFromOtherAccount}
  customEmojis={customEmojis}
  filters={filters}
+ locale={props.locale}
  />
  </List.Item>
  )

diff --git a/src/components/timelines/Show.tsx b/src/components/timelines/Show.tsx
@@ -14,6 +14,7 @@ type Props = {
  openMedia: (media: Array<Entity.Attachment>, index: number) => void
  openReport: (status: Entity.Status, client: MegalodonInterface) => void
  openFromOtherAccount: (status: Entity.Status) => void
+ locale: string
 }
 
 const Show: React.FC<Props> = props => {
@@ -27,6 +28,7 @@ const Show: React.FC<Props> = props => {
  openMedia={props.openMedia}
  openReport={props.openReport}
  openFromOtherAccount={props.openFromOtherAccount}
+ locale={props.locale}
  />
  )
  } else if (props.timeline.kind === 'direct') {
@@ -39,6 +41,7 @@ const Show: React.FC<Props> = props => {
  openMedia={props.openMedia}
  openReport={props.openReport}
  openFromOtherAccount={props.openFromOtherAccount}
+ locale={props.locale}
  />
  )
  }

diff --git a/src/components/timelines/Timeline.tsx b/src/components/timelines/Timeline.tsx
@@ -64,6 +64,7 @@ type Props = {
  openMedia: (media: Array<Entity.Attachment>, index: number) => void
  openReport: (status: Entity.Status, client: MegalodonInterface) => void
  openFromOtherAccount: (status: Entity.Status) => void
+ locale: string
 }
 
 export default function TimelineColumn(props: Props) {
@@ -535,6 +536,7 @@ export default function TimelineColumn(props: Props) {
  openFromOtherAccount={props.openFromOtherAccount}
  customEmojis={customEmojis}
  filters={filters}
+ locale={props.locale}
  />
  </List.Item>
  )}

diff --git a/src/components/timelines/notification/Notification.tsx b/src/components/timelines/notification/Notification.tsx
@@ -24,6 +24,7 @@ type Props = {
  openFromOtherAccount: (status: Entity.Status) => void
  customEmojis: Array<CustomEmojiCategory>
  filters: Array<Entity.Filter>
+ locale: string
 }
 
 const notification = (props: Props) => {
@@ -67,6 +68,7 @@ const notification = (props: Props) => {
  openReport={props.openReport}
  openFromOtherAccount={props.openFromOtherAccount}
  customEmojis={props.customEmojis}
+ locale={props.locale}
  />
  )
  } else {
@@ -91,6 +93,7 @@ const notification = (props: Props) => {
  openFromOtherAccount={props.openFromOtherAccount}
  customEmojis={props.customEmojis}
  filters={props.filters}
+ locale={props.locale}
  />
  )
  } else {

diff --git a/src/components/timelines/notification/Reaction.tsx b/src/components/timelines/notification/Reaction.tsx
@@ -30,6 +30,7 @@ type Props = {
  openReport: (status: Entity.Status, client: MegalodonInterface) => void
  openFromOtherAccount: (status: Entity.Status) => void
  customEmojis: Array<CustomEmojiCategory>
+ locale: string
 }
 
 const actionIcon = (notification: Entity.Notification) => {
@@ -315,6 +316,7 @@ const Reaction: React.FC<Props> = props => {
  openReport={() => props.openReport(status, props.client)}
  openFromOtherAccount={() => props.openFromOtherAccount(status)}
  customEmojis={props.customEmojis}
+ locale={props.locale}
  />
  </div>
  </div>
@@ -326,6 +328,7 @@ const Reaction: React.FC<Props> = props => {
  account={props.account}
  in_reply_to={status}
  onClose={() => setShowReply(false)}
+ locale={props.locale}
  />
  </div>
  )}
@@ -337,6 +340,7 @@ const Reaction: React.FC<Props> = props => {
  account={props.account}
  edit_target={status}
  onClose={() => setShowEdit(false)}
+ locale={props.locale}
  />
  </div>
  )}