From 82505bad62d72073b2873aeaf4d3a36da55183f2 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Wed, 22 Jan 2020 17:33:14 +0100
Subject: [PATCH] Fix: Corrected all the labels and removed the fixed side bar.

---
 .../mastodon/features/getting_started/index.js         | 10 +++++-----
 .../mastodon/features/ui/components/columns_area.js    |  6 ------
 .../features/ui/components/navigation_panel.js         |  4 ++--
 app/javascript/mastodon/locales/en.json                |  4 ++--
 app/javascript/mastodon/locales/ja.json                |  4 ++--
 app/views/settings/preferences/other/show.html.haml    |  2 +-
 config/locales/en.yml                                  |  6 +++---
 config/locales/ja.yml                                  |  6 +++---
 8 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index 029450d6d9..d9b246e688 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -37,8 +37,8 @@ const messages = defineMessages({
   menu: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
   profile_directory: { id: 'getting_started.directory', defaultMessage: 'Profile directory' },
   information: { id: 'navigation_bar.information', defaultMessage: 'Information' },
-  information_acct: { id: 'navigation_bar.information_acct', defaultMessage: 'Fedibird info' },
-  hashtag_fedibird: { id: 'navigation_bar.hashtag_fedibird', defaultMessage: 'fedibird' },
+  information_acct: { id: 'navigation_bar.information_acct', defaultMessage: 'Qoto Announcements' },
+  hashtag_qoto_journal: { id: 'navigation_bar.hashtag_qoto_journal', defaultMessage: 'Qoto Journal' },
 });
 
 const mapStateToProps = state => ({
@@ -116,8 +116,8 @@ class GettingStarted extends ImmutablePureComponent {
 
       navItems.push(
         <ColumnSubheading key={i++} text={intl.formatMessage(messages.information)} />,
-        <ColumnLink key={i++} icon='info-circle' text={intl.formatMessage(messages.information_acct)} to='/accounts/2' />,
-        <ColumnLink key={i++} icon='hashtag' text={intl.formatMessage(messages.hashtag_fedibird)} to='/timelines/tag/fedibird' />,
+          <ColumnLink key={i++} icon='info-circle' text={intl.formatMessage(messages.information_acct)} to='/accounts/95378' />,
+        <ColumnLink key={i++} icon='hashtag' text={intl.formatMessage(messages.hashtag_qoto_journal)} to='/timelines/tag/QotoJournal' />,
       );
 
       height += 34 + 48*2;
@@ -136,7 +136,7 @@ class GettingStarted extends ImmutablePureComponent {
 
       navItems.push(
         <ColumnLink key={i++} icon='info-circle' text={intl.formatMessage(messages.information_acct)} to='/accounts/2' />,
-        <ColumnLink key={i++} icon='hashtag' text={intl.formatMessage(messages.hashtag_fedibird)} to='/timelines/tag/fedibird' />,
+        <ColumnLink key={i++} icon='hashtag' text={intl.formatMessage(messages.hashtag_qoto_journal)} to='/timelines/tag/QotoJornal' />,
       );
 
       height += 48*2;
diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index bcbd8cd858..0e601150f8 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -208,7 +208,6 @@ class ColumnsArea extends ImmutablePureComponent {
 
           <div className='columns-area__panels__pane columns-area__panels__pane--start columns-area__panels__pane--navigational'>
             <div className='columns-area__panels__pane__inner'>
-              <NavigationPanel />
             </div>
           </div>
 
@@ -231,11 +230,6 @@ class ColumnsArea extends ImmutablePureComponent {
         })}
 
         {React.Children.map(children, child => React.cloneElement(child, { multiColumn: true }))}
-        <div className='columns-area__panels__pane columns-area__panels__pane--start columns-area__panels__pane--navigational'>
-          <div className='columns-area__panels__pane__inner'>
-            <NavigationPanel />
-          </div>
-        </div>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.js b/app/javascript/mastodon/features/ui/components/navigation_panel.js
index cfb6bc613f..3e85fffd96 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.js
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.js
@@ -15,8 +15,8 @@ const NavigationPanel = () => (
     <NavLink className='column-link column-link--transparent' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><NotificationsCounterIcon className='column-link__icon' /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>
     <FollowRequestsNavLink />
     <NavLink className='column-link column-link--transparent' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon className='column-link__icon' id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>
-    <NavLink className='column-link column-link--transparent' to='/accounts/2'><Icon className='column-link__icon' id='info-circle' fixedWidth /><FormattedMessage id='navigation_bar.information_acct' defaultMessage='Fedibird info' /></NavLink>
-    <NavLink className='column-link column-link--transparent' to='/timelines/tag/fedibird'><Icon className='column-link__icon' id='hashtag' fixedWidth /><FormattedMessage id='navigation_bar.hashtag_fedibird' defaultMessage='Fedibird topics' /></NavLink>
+    <NavLink className='column-link column-link--transparent' to='/accounts/95378'><Icon className='column-link__icon' id='info-circle' fixedWidth /><FormattedMessage id='navigation_bar.information_acct' defaultMessage='Qoto info' /></NavLink>
+    <NavLink className='column-link column-link--transparent' to='/timelines/tag/QotoJournal'><Icon className='column-link__icon' id='hashtag' fixedWidth /><FormattedMessage id='navigation_bar.hashtag_qoto_journal' defaultMessage='Qoto Journal' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/timelines/direct'><Icon className='column-link__icon' id='envelope' fixedWidth /><FormattedMessage id='navigation_bar.direct' defaultMessage='Direct messages' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/favourites'><Icon className='column-link__icon' id='star' fixedWidth /><FormattedMessage id='navigation_bar.favourites' defaultMessage='Favourites' /></NavLink>
     <NavLink className='column-link column-link--transparent' to='/bookmarks'><Icon className='column-link__icon' id='bookmark' fixedWidth /><FormattedMessage id='navigation_bar.bookmarks' defaultMessage='Bookmarks' /></NavLink>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 9839cc20f0..cc72d9896b 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -280,10 +280,10 @@
   "navigation_bar.filters": "Muted words",
   "navigation_bar.follow_requests": "Follow requests",
   "navigation_bar.follows_and_followers": "Follows and followers",
-  "navigation_bar.hashtag_fedibird": "Fedibird topics",
+  "navigation_bar.hashtag_qoto_journal": "Qoto Journal",
   "navigation_bar.info": "About this server",
   "navigation_bar.information": "Information",
-  "navigation_bar.information_acct": "Fedibird info",
+  "navigation_bar.information_acct": "Qoto Announcements",
   "navigation_bar.keyboard_shortcuts": "Hotkeys",
   "navigation_bar.lists": "Lists",
   "navigation_bar.logout": "Logout",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 62f0fe1e25..e832640c02 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -280,10 +280,10 @@
   "navigation_bar.filters": "フィルター設定",
   "navigation_bar.follow_requests": "フォローリクエスト",
   "navigation_bar.follows_and_followers": "フォロー・フォロワー",
-  "navigation_bar.hashtag_fedibird": "Fedibirdに関する話題",
+  "navigation_bar.hashtag_qoto_journal": "Qoto Journal",
   "navigation_bar.info": "このサーバーについて",
   "navigation_bar.information": "お知らせと情報",
-  "navigation_bar.information_acct": "Fedibirdインフォメーション",
+  "navigation_bar.information_acct": "Qoto Announcements",
   "navigation_bar.keyboard_shortcuts": "ホットキー",
   "navigation_bar.lists": "リスト",
   "navigation_bar.logout": "ログアウト",
diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml
index 6028244eaf..fd89d64154 100644
--- a/app/views/settings/preferences/other/show.html.haml
+++ b/app/views/settings/preferences/other/show.html.haml
@@ -31,7 +31,7 @@
   .fields-group
     = f.input :setting_show_application, as: :boolean, wrapper: :with_label, recommended: true
 
-  %h4= t 'preferences.fedibird_features'
+  %h4= t 'preferences.qoto_features'
 
   .fields-group
     = f.input :setting_show_follow_button_on_timeline, as: :boolean, wrapper: :with_label
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 57eb28f471..d735e73a5f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -997,7 +997,7 @@ en:
       too_few_options: must have more than one item
       too_many_options: can't contain more than %{max} items
   preferences:
-    fedibird_features: Fedibird features
+    qoto_features: Qoto features
     other: Other
     posting_defaults: Posting defaults
     public_timelines: Public timelines
@@ -1315,14 +1315,14 @@ en:
       edit_profile_step: You can customize your profile by uploading an avatar, header, changing your display name and more. If you’d like to review new followers before they’re allowed to follow you, you can lock your account.
       explanation: Here are some tips to get you started
       final_action: Start posting
-      final_step: 'Start posting! Even without followers your public messages may be seen by others, for example on the federation timeline and in hashtags. You may want to introduce yourself on the #fedibird hashtag.'
+      final_step: 'Start posting! Even without followers your public messages may be seen by others, for example on the federation timeline and in hashtags. You may want to introduce yourself on the #Introduction hashtag or share professional work via the #QotoJournal hashtag.'
       full_handle: Your full handle
       full_handle_hint: This is what you would tell your friends so they can message or follow you from another server.
       review_preferences_action: Change preferences
       review_preferences_step: Make sure to set your preferences, such as which emails you'd like to receive, or what privacy level you’d like your posts to default to. If you don’t have motion sickness, you could choose to enable GIF autoplay.
       subject: Welcome to Mastodon
       tip_federated_timeline: The federated timeline is a firehose view of the Mastodon network. But it only includes people your neighbors are subscribed to or posts sent via relay, so it's not complete.
-      tip_following: "You follow your server's information account by default. To find more interesting people, check the #fedibird tag and federated timelines."
+      tip_following: "You follow your server's information account by default. To find more interesting people, check the #Introduction tag, #QotoJournal tag, and the federated timelines."
       tip_local_timeline: The local timeline is a firehose view of people on %{instance}. These are your immediate neighbours!
       tip_mobile_webapp: If your mobile browser offers you to add Mastodon to your homescreen, you can receive push notifications. It acts like a native app in many ways!
       tips: Tips
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index c7355f2408..49b6af76e5 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -966,7 +966,7 @@ ja:
       too_few_options: は複数必要です
       too_many_options: は%{max}個までです
   preferences:
-    fedibird_features: Fedibirdの機能
+    qoto_features: Qotoの機能
     other: その他
     posting_defaults: デフォルトの投稿設定
     public_timelines: 公開タイムライン
@@ -1271,14 +1271,14 @@ ja:
       edit_profile_step: アイコンやヘッダーの画像をアップロードしたり、表示名を変更したりして、自分のプロフィールをカスタマイズすることができます。また、誰かからの新規フォローを許可する前にその人の様子を見ておきたい場合、アカウントを承認制にすることもできます。
       explanation: 始めるにあたってのアドバイスです
       final_action: 始めましょう
-      final_step: 'さあ、始めましょう！ たとえフォロワーがまだいなくても、あなたの公開した投稿は連合タイムラインやハッシュタグなどを通じて誰かの目にとまるはずです。自己紹介をしたいときには #fedibird ハッシュタグが便利かもしれません。'
+      final_step: 'さあ、始めましょう！ たとえフォロワーがまだいなくても、あなたの公開した投稿は連合タイムラインやハッシュタグなどを通じて誰かの目にとまるはずです。自己紹介をしたいときには #qoto ハッシュタグが便利かもしれません。'
       full_handle: あなたの正式なユーザーID
       full_handle_hint: 別のサーバーの友達とフォローやメッセージをやり取りする際には、これを伝えることになります。
       review_preferences_action: 設定の変更
       review_preferences_step: 受け取りたいメールの種類や投稿のデフォルト公開範囲など、ユーザー設定を必ず済ませておきましょう。目が回らない自信があるなら、アニメーション GIF を自動再生する設定もご検討ください。
       subject: Mastodon へようこそ
       tip_federated_timeline: 連合タイムラインは Mastodon ネットワークの流れを見られるものです。ただしあなたと同じサーバーの人がフォローしている人や、リレーを経由して送られてくる投稿だけが含まれるので、それが全てではありません。
-      tip_following: 最初は、サーバーのインフォメーションアカウントをフォローした状態になっています。もっと興味のある人たちを見つけるには、#fedibird ハッシュタグタイムラインと連合タイムラインを確認してみましょう。
+      tip_following: 最初は、サーバーのインフォメーションアカウントをフォローした状態になっています。もっと興味のある人たちを見つけるには、#qoto ハッシュタグタイムラインと連合タイムラインを確認してみましょう。
       tip_local_timeline: ローカルタイムラインは %{instance} にいる人々の流れを見られるものです。彼らはあなたと同じサーバーにいる隣人のようなものです！
       tip_mobile_webapp: お使いのモバイル端末で、ブラウザから Mastodon をホーム画面に追加できますか？ もし追加できる場合、プッシュ通知の受け取りなど、まるで「普通の」アプリのような機能が楽しめます！
       tips: 豆知識
-- 
GitLab