FIx title and locales

BoostIO · Sep 3, 2020 · 811db3b · 811db3b
1 parent 14ef921
commit 811db3b
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 21 deletions.
diff --git a/src/components/atoms/TagNavigatorListItem.tsx b/src/components/atoms/TagNavigatorListItem.tsx
@@ -72,7 +72,7 @@ const TagNavigatorListItem = ({
   return (
     <TagItem>
       <TagItemAnchor
-        title={`${tag}: ${t('general.allnote')}`}
+        title={`#${tag}`}
         onClick={() => {
           push(`/app/storages/${storageId}/tags/${tag}/${noteId}`)
         }}
@@ -81,7 +81,7 @@ const TagNavigatorListItem = ({
         {tag}
       </TagItemAnchor>
       <TagRemoveButton
-        title={t('tag.remove')}
+        title={t('tag.removeX', { tag })}
         onClick={() => {
           removeTagByName(tag)
         }}

diff --git a/src/components/molecules/NoteDetailNavigator.tsx b/src/components/molecules/NoteDetailNavigator.tsx
@@ -52,12 +52,11 @@ const NavigatorFolderItem: React.FC<FolderNavItemProps> = ({
   folderPathname,
   noteId,
 }: FolderNavItemProps) => {
-  const { t } = useTranslation()
   const { push } = useRouter()
 
   return (
     <NoteDetailNavigatorItem
-      title={`${t('general.allNotes')}(${storageName}${folderPathname})`}
+      title={`${storageName}${folderPathname}`}
       onClick={(event: MouseEvent<HTMLAnchorElement>) => {
         event.preventDefault()
         push(`/app/storages/${storageId}/notes${folderPathname}/${noteId}`)
@@ -75,7 +74,6 @@ const NoteDetailFolderNavigator = ({
   noteId,
   noteFolderPathname,
 }: NoteDetailFolderNavigatorProps) => {
-  const { t } = useTranslation()
   const { push } = useRouter()
   const routeParams = useRouteParams()
 
@@ -109,7 +107,7 @@ const NoteDetailFolderNavigator = ({
         <Icon path={mdiBookOpen} />
       </IconContainer>
       <NoteDetailNavigatorItem
-        title={`${t('general.allNotes')}(${storageName})`}
+        title={storageName}
         onClick={(event: MouseEvent<HTMLAnchorElement>) => {
           event.preventDefault()
           push(`/app/storages/${storageId}/notes/${noteId}`)

diff --git a/src/components/molecules/NoteDetailTagNavigator.tsx b/src/components/molecules/NoteDetailTagNavigator.tsx
@@ -97,7 +97,7 @@ const NoteDetailTagNavigator = ({
   return (
     <>
       <Container>
-        <IconContainer title={t('tag.tag')}>
+        <IconContainer title={t('tag.tags')}>
           <Icon path={mdiTagMultiple} />{' '}
         </IconContainer>
         <TagNavigatorList>

diff --git a/src/components/molecules/TagListFragment.tsx b/src/components/molecules/TagListFragment.tsx
@@ -88,7 +88,7 @@ const TagListFragment = ({ storage }: TagListFragmentProps) => {
       <SideNavigatorItem
         depth={0}
         iconPath={mdiTagMultiple}
-        label={t('tag.tag')}
+        label={t('tag.tags')}
         folded={tagList.length > 0 ? tagListIsFolded : undefined}
         onFoldButtonClick={() => {
           toggleSideNavOpenedItem(tagListNavItemId)

diff --git a/src/locales/de.ts b/src/locales/de.ts
@@ -43,7 +43,7 @@ export default {
     'folder.removeMessage': 'Alle Notizen und Unterordner werden gelöscht.',
 
     //Tag
-    'tag.tag': 'Tag',
+    'tag.tags': 'Tag',
     'tag.remove': 'Tag löschen',
     'tag.removeMessage': 'Das Tag wird von allen Notizen entfernt.',
 

diff --git a/src/locales/enUS.ts b/src/locales/enUS.ts
@@ -45,9 +45,10 @@ export default {
     'folder.removeMessage': 'All notes and subfolders will be deleted.',
 
     //Tag
-    'tag.tag': 'Tags',
+    'tag.tags': 'Tags',
     'tag.add': 'Add Tag',
     'tag.remove': 'Remove Tag',
+    'tag.removeX': 'Remove #{{tag}}',
     'tag.removeMessage': 'The tag will be untagged from all notes.',
 
     //Note

diff --git a/src/locales/esES.ts b/src/locales/esES.ts
@@ -45,7 +45,7 @@ export default {
       'Todas las notas y subcarpetas van a ser eliminadas.',
 
     //Tag
-    'tag.tag': 'Etiqueta',
+    'tag.tags': 'Etiqueta',
     'tag.remove': 'Eliminar etiqueta',
     'tag.removeMessage': 'Vas a quitar esta etiqueta de todas las notas.',
 

diff --git a/src/locales/frFR.ts b/src/locales/frFR.ts
@@ -45,7 +45,7 @@ export default {
       'Toutes les notes et sous-dossiers seront supprimés.',
 
     //Tag
-    'tag.tag': 'Tags',
+    'tag.tags': 'Tags',
     'tag.remove': 'Supprimer Tag',
     'tag.removeMessage': 'Le tag sera retiré de toutes les notes.',
 

diff --git a/src/locales/itIT.ts b/src/locales/itIT.ts
@@ -43,7 +43,7 @@ export default {
     'folder.removeMessage': 'Tutte le note e sottocartelle sarnno eliminate.',
 
     //Tag
-    'tag.tag': 'Tags',
+    'tag.tags': 'Tags',
     'tag.remove': 'Rimuovi Tag',
     'tag.removeMessage': 'Il tag verrà rimosso da tutte le note',
 

diff --git a/src/locales/ja.ts b/src/locales/ja.ts
@@ -42,7 +42,7 @@ export default {
     'folder.removeMessage': 'フォルダを削除すると全てのノートも削除されます',
 
     //Tag
-    'tag.tag': 'タグ',
+    'tag.tags': 'タグ',
     'tag.remove': 'タグを削除する',
     'tag.removeMessage': '全てのノートからタグが削除されます',
 

diff --git a/src/locales/ko.ts b/src/locales/ko.ts
@@ -41,7 +41,7 @@ export default {
     'folder.removeMessage': '모든 폴더와 하위폴더가 삭제됩니다.',
 
     //Tag
-    'tag.tag': '태그',
+    'tag.tags': '태그',
     'tag.remove': '태그 제거',
     'tag.removeMessage': '해당 태그가 모든 노트에서 제거됩니다.',
 

diff --git a/src/locales/ptBR.ts b/src/locales/ptBR.ts
@@ -44,7 +44,7 @@
     'folder.removeMessage': 'Todas as notas e sub-pastas serão deletadas.',
 
     //Tag
-    'tag.tag': 'Tags',
+    'tag.tags': 'Tags',
     'tag.remove': 'Remover Tag',
     'tag.removeMessage': 'A Tag será removida de todas as notas.',
 

diff --git a/src/locales/ukUA.ts b/src/locales/ukUA.ts
@@ -42,7 +42,7 @@ export default {
     'folder.removeMessage': 'Усі нотатки та папки будуть видалені.',
 
     // Tag
-    'tag.tag': 'Теги',
+    'tag.tags': 'Теги',
     'tag.remove': 'Видалити тег',
     'tag.removeMessage': 'Тег буде відмічений від усіх нотаток.',
 

diff --git a/src/locales/zhCN.ts b/src/locales/zhCN.ts
@@ -41,7 +41,7 @@ export default {
     'folder.removeMessage': '所有笔记和子文件夹将被删除.',
 
     //Tag
-    'tag.tag': '标签',
+    'tag.tags': '标签',
     'tag.remove': '移除标签',
     'tag.removeMessage': '这个标签将从所有笔记中被移除.',
 

diff --git a/src/locales/zhHK.ts b/src/locales/zhHK.ts
@@ -41,7 +41,7 @@ export default {
     'folder.removeMessage': '所有筆記和子資料夾將被刪除.',
 
     //Tag
-    'tag.tag': '標籤',
+    'tag.tags': '標籤',
     'tag.remove': '移除標籤',
     'tag.removeMessage': '這個標籤將從所有筆記中被移除.',
 

diff --git a/src/locales/zhTW.ts b/src/locales/zhTW.ts
@@ -41,7 +41,7 @@ export default {
     'folder.removeMessage': '所有筆記和子資料夾將會被刪除。',
 
     //Tag
-    'tag.tag': '標籤',
+    'tag.tags': '標籤',
     'tag.remove': '移除標籤',
     'tag.removeMessage': '此標籤將從所有筆記中被移除。',
 

diff --git a/src/mobile/components/molecules/TagListFragment.tsx b/src/mobile/components/molecules/TagListFragment.tsx
@@ -92,7 +92,7 @@ const TagListFragment = ({ storage }: TagListFragmentProps) => {
       <NavigatorItem
         depth={1}
         iconPath={mdiTagMultiple}
-        label={t('tag.tag')}
+        label={t('tag.tags')}
         folded={tagList.length > 0 ? tagListIsFolded : undefined}
         onFoldButtonClick={() => {
           toggleSideNavOpenedItem(tagListNavItemId)