From 68193c653e30654156ded3e4ecf4cbfcd38990e4 Mon Sep 17 00:00:00 2001 From: a1012112796 <1012112796@qq.com> Date: Mon, 17 Oct 2022 11:38:39 +0000 Subject: [PATCH 1/4] adapt README_{Contry}.md stype name in localizedExtensions Signed-off-by: a1012112796 <1012112796@qq.com> --- routers/web/repo/view.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 3e869376ee37..6fc8e6d2740e 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -151,8 +151,8 @@ func localizedExtensions(ext, languageCode string) (localizedExts []string) { if strings.Contains(lowerLangCode, "-") { underscoreLangCode := strings.ReplaceAll(lowerLangCode, "-", "_") indexOfDash := strings.Index(lowerLangCode, "-") - // e.g. [.zh-cn.md, .zh_cn.md, .zh.md, .md] - return []string{lowerLangCode + ext, underscoreLangCode + ext, lowerLangCode[:indexOfDash] + ext, ext} + // e.g. [.zh-cn.md, .zh_cn.md, .zh.md, _zh.md, .md] + return []string{lowerLangCode + ext, underscoreLangCode + ext, lowerLangCode[:indexOfDash] + ext, strings.Replace(lowerLangCode[:indexOfDash]+ext, ".", "_", 1), ext} } // e.g. [.en.md, .md] From 9cb175e8ced2e6d16a1bcd0b33f39886d910015c Mon Sep 17 00:00:00 2001 From: a1012112796 <1012112796@qq.com> Date: Mon, 17 Oct 2022 12:10:38 +0000 Subject: [PATCH 2/4] fix test Signed-off-by: a1012112796 <1012112796@qq.com> --- routers/web/repo/view_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/routers/web/repo/view_test.go b/routers/web/repo/view_test.go index 9d5a88fca412..803906b21778 100644 --- a/routers/web/repo/view_test.go +++ b/routers/web/repo/view_test.go @@ -38,19 +38,19 @@ func Test_localizedExtensions(t *testing.T) { name: "With region - lowercase", languageCode: "en-us", ext: ".md", - wantLocalizedExts: []string{".en-us.md", ".en_us.md", ".en.md", ".md"}, + wantLocalizedExts: []string{".en-us.md", ".en_us.md", ".en.md", "_en.md", ".md"}, }, { name: "With region - uppercase", languageCode: "en-CA", ext: ".MD", - wantLocalizedExts: []string{".en-ca.MD", ".en_ca.MD", ".en.MD", ".MD"}, + wantLocalizedExts: []string{".en-ca.MD", ".en_ca.MD", ".en.MD", "_en.MD", ".MD"}, }, { name: "With region - all uppercase", languageCode: "ZH-TW", ext: ".md", - wantLocalizedExts: []string{".zh-tw.md", ".zh_tw.md", ".zh.md", ".md"}, + wantLocalizedExts: []string{".zh-tw.md", ".zh_tw.md", ".zh.md", "_zh.md", ".md"}, }, } for _, tt := range tests { From ed935b2b164729a6b9779bb9c9fd268cfa58d708 Mon Sep 17 00:00:00 2001 From: a1012112796 <1012112796@qq.com> Date: Wed, 19 Oct 2022 08:02:26 +0800 Subject: [PATCH 3/4] Update routers/web/repo/view.go Co-authored-by: zeripath --- routers/web/repo/view.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 6fc8e6d2740e..7c10f0e56fbe 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -152,7 +152,7 @@ func localizedExtensions(ext, languageCode string) (localizedExts []string) { underscoreLangCode := strings.ReplaceAll(lowerLangCode, "-", "_") indexOfDash := strings.Index(lowerLangCode, "-") // e.g. [.zh-cn.md, .zh_cn.md, .zh.md, _zh.md, .md] - return []string{lowerLangCode + ext, underscoreLangCode + ext, lowerLangCode[:indexOfDash] + ext, strings.Replace(lowerLangCode[:indexOfDash]+ext, ".", "_", 1), ext} + return []string{lowerLangCode + ext, underscoreLangCode + ext, lowerLangCode[:indexOfDash] + ext, "_" +lowerLangCode[1:indexOfDash]+ext, ext} } // e.g. [.en.md, .md] From 9618c87dcb2c5310be43081e504e0fc16ab9a5be Mon Sep 17 00:00:00 2001 From: a1012112796 <1012112796@qq.com> Date: Wed, 19 Oct 2022 07:44:37 +0000 Subject: [PATCH 4/4] make fmt Signed-off-by: a1012112796 <1012112796@qq.com> --- routers/web/repo/view.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 7c10f0e56fbe..661c1bec5b22 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -152,7 +152,7 @@ func localizedExtensions(ext, languageCode string) (localizedExts []string) { underscoreLangCode := strings.ReplaceAll(lowerLangCode, "-", "_") indexOfDash := strings.Index(lowerLangCode, "-") // e.g. [.zh-cn.md, .zh_cn.md, .zh.md, _zh.md, .md] - return []string{lowerLangCode + ext, underscoreLangCode + ext, lowerLangCode[:indexOfDash] + ext, "_" +lowerLangCode[1:indexOfDash]+ext, ext} + return []string{lowerLangCode + ext, underscoreLangCode + ext, lowerLangCode[:indexOfDash] + ext, "_" + lowerLangCode[1:indexOfDash] + ext, ext} } // e.g. [.en.md, .md]