Skip to content

Commit ea28b04

Browse files
committed
ref(locale): use go-i18n.Message directly instead of extendio (#216)
1 parent 2eb2453 commit ea28b04

6 files changed

+15
-12
lines changed

.vscode/settings.json

+1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
"nakedret",
6767
"natefinch",
6868
"navi",
69+
"nicksnyder",
6970
"nolint",
7071
"nolintlint",
7172
"nosec",

src/locale/messages-command-errors.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package locale
22

33
import (
4+
"github.com/nicksnyder/go-i18n/v2/i18n"
45
xi18n "github.com/snivilised/extendio/i18n"
56
)
67

@@ -12,8 +13,8 @@ type ShrinkCmdSamplingFactorInvalidTemplData struct {
1213
Acceptable string
1314
}
1415

15-
func (td ShrinkCmdSamplingFactorInvalidTemplData) Message() *xi18n.Message {
16-
return &xi18n.Message{
16+
func (td ShrinkCmdSamplingFactorInvalidTemplData) Message() *i18n.Message {
17+
return &i18n.Message{
1718
ID: "shrink-cmd-sampling-factor-invalid.error",
1819
Description: "shrink command sampling factor failed validation",
1920
Other: "invalid sampling factor value: {{.Value}}, acceptable: {{.Acceptable}}",
@@ -49,8 +50,8 @@ type ShrinkCmdInterlaceInvalidTemplData struct {
4950
Acceptable string
5051
}
5152

52-
func (td ShrinkCmdInterlaceInvalidTemplData) Message() *xi18n.Message {
53-
return &xi18n.Message{
53+
func (td ShrinkCmdInterlaceInvalidTemplData) Message() *i18n.Message {
54+
return &i18n.Message{
5455
ID: "shrink-cmd-interlace-invalid.error",
5556
Description: "shrink command interlace failed validation",
5657
Other: "invalid interlace value: {{.Value}}, acceptable: {{.Acceptable}}",
@@ -85,8 +86,8 @@ type ShrinkCmdOutputPathDoesNotExistTemplData struct {
8586
Path string
8687
}
8788

88-
func (td ShrinkCmdOutputPathDoesNotExistTemplData) Message() *xi18n.Message {
89-
return &xi18n.Message{
89+
func (td ShrinkCmdOutputPathDoesNotExistTemplData) Message() *i18n.Message {
90+
return &i18n.Message{
9091
ID: "shrink-cmd-output-path-does-not-exist.error",
9192
Description: "shrink command mirror path does not exist validation",
9293
Other: "output path: {{.Path}}, does not exist",

src/locale/messages-command.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package locale
22

33
import (
4-
"github.com/snivilised/extendio/i18n"
4+
"github.com/nicksnyder/go-i18n/v2/i18n"
55
)
66

77
// ⚠️ for the usage definitions, make sure that the first token inside the "Other"

src/locale/messages-errors.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package locale
22

33
import (
4-
i18n "github.com/snivilised/extendio/i18n"
4+
i18n "github.com/nicksnyder/go-i18n/v2/i18n"
5+
xi18n "github.com/snivilised/extendio/i18n"
56
)
67

78
// ❌ FooBar
@@ -34,7 +35,7 @@ type FooBarErrorBehaviourQuery interface {
3435
}
3536

3637
type FooBarError struct {
37-
i18n.LocalisableError
38+
xi18n.LocalisableError
3839
}
3940

4041
// FooBar enables the client to check if error is FooBarError
@@ -46,7 +47,7 @@ func (e FooBarError) FooBar() bool {
4647
// NewFooBarError creates a FooBarError
4748
func NewFooBarError(path string, reason error) FooBarError {
4849
return FooBarError{
49-
LocalisableError: i18n.LocalisableError{
50+
LocalisableError: xi18n.LocalisableError{
5051
Data: FooBarTemplData{
5152
Path: path,
5253
Reason: reason,

src/locale/messages-general.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package locale
22

33
import (
4-
"github.com/snivilised/extendio/i18n"
4+
"github.com/nicksnyder/go-i18n/v2/i18n"
55
)
66

77
type UsingConfigFileTemplData struct {

src/locale/test-locale-messages_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package locale_test
22

33
import (
4-
"github.com/snivilised/extendio/i18n"
4+
"github.com/nicksnyder/go-i18n/v2/i18n"
55
)
66

77
const (

0 commit comments

Comments
 (0)