Fix some test

Author: Gusted

modules/timeutil/since_test.go

@@ -119,7 +119,7 @@ func TestHtmlTimeSince(t *testing.T) {
 	setting.DefaultUILocation = time.UTC
 	// test that `diff` yields a result containing `expected`
 	test := func(expected string, diff time.Duration) {
-		actual := htmlTimeSince(BaseDate, BaseDate.Add(diff), "en")
+		actual := htmlTimeSince(BaseDate, BaseDate.Add(diff), translation.NewLocale("en-US"))
 		assert.Contains(t, actual, `title="Sat Jan  1 00:00:00 UTC 2000"`)
 		assert.Contains(t, actual, expected)
 	}

modules/translation/i18n/i18n.go

@@ -62,6 +62,9 @@ func (ls *LocaleStore) AddLocaleByIni(langName, langDesc string, localeFile inte
 		ls.langNames = append(ls.langNames, langName)
 		ls.langDescs = append(ls.langDescs, langDesc)
 
+		// Specify the offset for translationValues.
+		ls.langOffsets = append(ls.langOffsets, len(ls.langOffsets))
+
 		// Make a distinquishment between production and development.
 		// For development, live-reload of the translation files is important.
 		// For production, we can do some expensive work and then make the querying fast.

modules/translation/i18n/i18n_test.go

@@ -7,7 +7,6 @@ package i18n
 import (
 	"testing"
 
-	"code.gitea.io/gitea/modules/setting"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -56,54 +55,3 @@ sub = Changed Sub String
 	assert.Equal(t, []string{"Lang1", "Lang2"}, descs)
 	assert.Equal(t, []int{0, 1}, offsets)
 }
-
-func Test_TrProd(t *testing.T) {
-	setting.IsProd = true
-	defer func() {
-		setting.IsProd = false
-	}()
-
-	testData1 := []byte(`
-.dot.name = Dot Name
-fmt = %[1]s %[2]s
-
-[section]
-sub = Sub String
-mixed = test value; <span style="color: red\; background: none;">more text</span>
-`)
-
-	testData2 := []byte(`
-fmt = %[2]s %[1]s
-
-[section]
-sub = Changed Sub String
-`)
-
-	ls := NewLocaleStore()
-	assert.NoError(t, ls.AddLocaleByIni("lang1", "Lang1", testData1))
-	assert.NoError(t, ls.AddLocaleByIni("lang2", "Lang2", testData2))
-	ls.SetDefaultLang("lang1")
-
-	result := ls.Tr("lang1", "fmt", "a", "b")
-	assert.Equal(t, "a b", result)
-
-	result = ls.Tr("lang2", "fmt", "a", "b")
-	assert.Equal(t, "b a", result)
-
-	result = ls.Tr("lang1", "section.sub")
-	assert.Equal(t, "Sub String", result)
-
-	result = ls.Tr("lang2", "section.sub")
-	assert.Equal(t, "Changed Sub String", result)
-
-	result = ls.Tr("", ".dot.name")
-	assert.Equal(t, "Dot Name", result)
-
-	result = ls.Tr("lang2", "section.mixed")
-	assert.Equal(t, `test value; <span style="color: red; background: none;">more text</span>`, result)
-
-	langs, descs, offsets := ls.ListLangNameDescOffsets()
-	assert.Equal(t, []string{"lang1", "lang2"}, langs)
-	assert.Equal(t, []string{"Lang1", "Lang2"}, descs)
-	assert.Equal(t, []int{0, 1}, offsets)
-}