From c8f882ca50e06a0a7e1fbb88fcf5b4b6e9b1c306 Mon Sep 17 00:00:00 2001 From: yoheizuho Date: Mon, 11 Mar 2019 08:27:02 +0900 Subject: [PATCH 1/4] Japanese translate update & fix typo --- resources/lang/ja/navmenu.php | 31 ++++++++++++++++++------------- resources/lang/ja/site.php | 2 +- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/resources/lang/ja/navmenu.php b/resources/lang/ja/navmenu.php index 64175ba59..e439a629b 100644 --- a/resources/lang/ja/navmenu.php +++ b/resources/lang/ja/navmenu.php @@ -1,14 +1,19 @@ - '検索', - 'home' => 'ホーム', - 'local' => 'ローカル', - 'discover' => '見つける', - 'viewMyProfile' => '自分のプロフィールを見る', - 'myTimeline' => 'タイムライン', - 'publicTimeline' => 'パブリックタイムライン', - 'remoteFollow' => 'リモートフォロー', - 'settings' => '設定', - 'admin' => '管理者', - 'logout' => 'ログアウト', - 'directMessages' => 'ダイレクトメッセージ', + '検索', + 'home' => 'ホーム', + 'local' => 'ローカル', + 'network' => 'ネットワーク', + 'discover' => '見つける', + 'viewMyProfile' => '自分のプロフィールを見る', + 'myTimeline' => 'タイムライン', + 'publicTimeline' => 'パブリックタイムライン', + 'remoteFollow' => 'リモートフォロー', + 'settings' => '設定', + 'admin' => '管理者', + 'logout' => 'ログアウト', + 'directMessages' => 'ダイレクトメッセージ', + ]; diff --git a/resources/lang/ja/site.php b/resources/lang/ja/site.php index 7c15c6783..98d542e50 100644 --- a/resources/lang/ja/site.php +++ b/resources/lang/ja/site.php @@ -7,7 +7,7 @@ return [ 'opensource' => 'オープンソース', 'terms' => '規約', 'privacy' => 'プライバシー', - 'l10nWip' => '私達はローカライズサポートに取り組んでいます。', + 'l10nWip' => '私達はローカライズサポートに取り組んでいます', 'currentLocale' => '現在のロケール', 'selectLocale' => 'リストの中からロケール（言語）を選択してください', ]; From 4d690e19d9da57b22460953a5b5f3a0a3c909db8 Mon Sep 17 00:00:00 2001 From: yoheizuho Date: Mon, 11 Mar 2019 09:01:39 +0900 Subject: [PATCH 2/4] Japanese translate update & fix typo --- resources/lang/ja/.navmenu.php.swp | Bin 0 -> 1024 bytes resources/lang/ja/navmenu.php | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 resources/lang/ja/.navmenu.php.swp diff --git a/resources/lang/ja/.navmenu.php.swp b/resources/lang/ja/.navmenu.php.swp new file mode 100644 index 0000000000000000000000000000000000000000..0e14de8a9ab59bad30da9118415f02ad1a5d8186 GIT binary patch literal 1024 zcmYc?$V<%2S1{7E)H7y40-IPE7%KBKQZuVcGxCwdu`%K5bTjgEQ*~2|%2JE4snZ8Z z>%&#+7i3nX=A@;j=oh6H=a&{GrxxqyB<7{-XC>25qa`u` literal 0 HcmV?d00001 diff --git a/resources/lang/ja/navmenu.php b/resources/lang/ja/navmenu.php index e439a629b..d81b076d6 100644 --- a/resources/lang/ja/navmenu.php +++ b/resources/lang/ja/navmenu.php @@ -2,18 +2,18 @@ return [ - 'search' => '検索', - 'home' => 'ホーム', - 'local' => 'ローカル', - 'network' => 'ネットワーク', - 'discover' => '見つける', - 'viewMyProfile' => '自分のプロフィールを見る', - 'myTimeline' => 'タイムライン', + 'search' => '検索', + 'home' => 'ホーム', + 'local' => 'ローカル', + 'network' => 'ネットワーク', + 'discover' => '見つける', + 'viewMyProfile' => '自分のプロフィールを見る', + 'myTimeline' => 'タイムライン', 'publicTimeline' => 'パブリックタイムライン', - 'remoteFollow' => 'リモートフォロー', - 'settings' => '設定', - 'admin' => '管理者', - 'logout' => 'ログアウト', + 'remoteFollow' => 'リモートフォロー', + 'settings' => '設定', + 'admin' => '管理者', + 'logout' => 'ログアウト', 'directMessages' => 'ダイレクトメッセージ', ]; From d0333e1cae1fccf910dfdb60cd5ee824fdea3810 Mon Sep 17 00:00:00 2001 From: YoheiZuho Date: Mon, 11 Mar 2019 16:17:37 +0900 Subject: [PATCH 3/4] Delete .navmenu.php.swp Delete .navmenu.php.swp --- resources/lang/ja/.navmenu.php.swp | Bin 1024 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 resources/lang/ja/.navmenu.php.swp diff --git a/resources/lang/ja/.navmenu.php.swp b/resources/lang/ja/.navmenu.php.swp deleted file mode 100644 index 0e14de8a9ab59bad30da9118415f02ad1a5d8186..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmYc?$V<%2S1{7E)H7y40-IPE7%KBKQZuVcGxCwdu`%K5bTjgEQ*~2|%2JE4snZ8Z z>%&#+7i3nX=A@;j=oh6H=a&{GrxxqyB<7{-XC>25qa`u` From bf90263259222b5d686f492d895b3386f0057828 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 11 Mar 2019 03:05:15 -0600 Subject: [PATCH 4/4] Update ProfileController --- app/Http/Controllers/ProfileController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 3580fb6ac..3d256e0c1 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -158,7 +158,7 @@ class ProfileController extends Controller public function showAtomFeed(Request $request, $user) { - $profile = $user = Profile::whereUsername($user)->firstOrFail(); + $profile = $user = Profile::whereNull('status')->whereNull('domain')->whereUsername($user)->whereIsPrivate(false)->firstOrFail(); if($profile->status != null) { return $this->accountCheck($profile); }