From e8fd4d2ecbd0227a74cee48f514d742b1620aa7a Mon Sep 17 00:00:00 2001 From: nas Date: Wed, 27 Nov 2019 23:23:48 +0900 Subject: [PATCH 1/5] :+1: Update go.mod --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 5eb1e8b16..101d6adc0 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ -module golang.org/x/text +module github.com/liquid-dev/text require golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e From a59be5404fa8971b53b8316fba70d3ffd04e6b20 Mon Sep 17 00:00:00 2001 From: nas Date: Wed, 27 Nov 2019 23:25:34 +0900 Subject: [PATCH 2/5] :+1: Update shiftjis for liquid --- encoding/japanese/shiftjis.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/encoding/japanese/shiftjis.go b/encoding/japanese/shiftjis.go index 16fd8a6e3..61cc29ce2 100644 --- a/encoding/japanese/shiftjis.go +++ b/encoding/japanese/shiftjis.go @@ -152,8 +152,13 @@ loop: goto write2 } } - err = internal.ErrASCIIReplacement - break + + // TODO: ここで処理が落ちてしまうため、落ちないよう強制的にcontinueするよう暫定的に修正する + continue + + // 以下のコードはライブラリでもともと実装してあったコード + // err = internal.ErrASCIIReplacement + // break } write1: From c5ff2746d5f5608e2643f50c7e60f5887aba4796 Mon Sep 17 00:00:00 2001 From: nas Date: Thu, 28 Nov 2019 00:09:14 +0900 Subject: [PATCH 3/5] :white_check_mark: Update import package for liquid --- cases/cases.go | 6 +++--- cases/context.go | 2 +- cases/context_test.go | 10 +++++----- cases/example_test.go | 4 ++-- cases/fold.go | 2 +- cases/fold_test.go | 2 +- cases/gen.go | 8 ++++---- cases/icu_test.go | 6 +++--- cases/map.go | 8 ++++---- cases/map_test.go | 8 ++++---- cmd/gotext/examples/extract/catalog.go | 6 +++--- cmd/gotext/examples/extract/main.go | 4 ++-- .../examples/extract_http/catalog_gen.go | 6 +++--- cmd/gotext/examples/extract_http/main.go | 2 +- cmd/gotext/examples/extract_http/pkg/pkg.go | 4 ++-- cmd/gotext/examples/rewrite/main.go | 4 ++-- cmd/gotext/examples/rewrite/printer.go | 4 ++-- cmd/gotext/extract.go | 2 +- cmd/gotext/generate.go | 2 +- cmd/gotext/main.go | 4 ++-- cmd/gotext/rewrite.go | 4 ++-- cmd/gotext/update.go | 2 +- collate/build/builder.go | 8 ++++---- collate/build/colelem.go | 2 +- collate/build/colelem_test.go | 2 +- collate/build/contract.go | 2 +- collate/build/contract_test.go | 2 +- collate/build/order.go | 4 ++-- collate/build/order_test.go | 2 +- collate/build/table.go | 2 +- collate/collate.go | 6 +++--- collate/collate_test.go | 4 ++-- collate/export_test.go | 2 +- collate/index.go | 2 +- collate/maketables.go | 12 ++++++------ collate/option.go | 6 +++--- collate/option_test.go | 4 ++-- collate/reg_test.go | 6 +++--- collate/sort_test.go | 4 ++-- collate/table_test.go | 6 +++--- collate/tools/colcmp/col.go | 4 ++-- collate/tools/colcmp/colcmp.go | 4 ++-- collate/tools/colcmp/gen.go | 4 ++-- currency/common.go | 2 +- currency/currency.go | 6 +++--- currency/currency_test.go | 6 +++--- currency/example_test.go | 2 +- currency/format.go | 4 ++-- currency/format_test.go | 4 ++-- currency/gen.go | 12 ++++++------ currency/gen_common.go | 2 +- currency/query.go | 2 +- currency/query_test.go | 2 +- currency/tables.go | 2 +- currency/tables_test.go | 10 +++++----- date/gen.go | 8 ++++---- date/gen_test.go | 12 ++++++------ date/tables.go | 2 +- encoding/charmap/charmap.go | 10 +++++----- encoding/charmap/charmap_test.go | 8 ++++---- encoding/charmap/maketables.go | 8 ++++---- encoding/charmap/tables.go | 4 ++-- encoding/encoding.go | 6 +++--- encoding/encoding_test.go | 6 +++--- encoding/example_test.go | 8 ++++---- encoding/htmlindex/gen.go | 2 +- encoding/htmlindex/htmlindex.go | 6 +++--- encoding/htmlindex/htmlindex_test.go | 10 +++++----- encoding/htmlindex/map.go | 16 ++++++++-------- encoding/ianaindex/example_test.go | 4 ++-- encoding/ianaindex/gen.go | 6 +++--- encoding/ianaindex/ianaindex.go | 16 ++++++++-------- encoding/ianaindex/ianaindex_test.go | 16 ++++++++-------- encoding/ianaindex/tables.go | 2 +- encoding/internal/enctest/enctest.go | 6 +++--- encoding/internal/identifier/gen.go | 2 +- encoding/internal/internal.go | 6 +++--- encoding/japanese/all.go | 2 +- encoding/japanese/all_test.go | 8 ++++---- encoding/japanese/eucjp.go | 8 ++++---- encoding/japanese/iso2022jp.go | 8 ++++---- encoding/japanese/maketables.go | 2 +- encoding/japanese/shiftjis.go | 8 ++++---- encoding/japanese/tables.go | 2 +- encoding/korean/all_test.go | 8 ++++---- encoding/korean/euckr.go | 8 ++++---- encoding/korean/maketables.go | 2 +- encoding/korean/tables.go | 2 +- encoding/simplifiedchinese/all.go | 2 +- encoding/simplifiedchinese/all_test.go | 8 ++++---- encoding/simplifiedchinese/gbk.go | 8 ++++---- encoding/simplifiedchinese/hzgb2312.go | 8 ++++---- encoding/simplifiedchinese/maketables.go | 2 +- encoding/simplifiedchinese/tables.go | 2 +- encoding/traditionalchinese/all_test.go | 8 ++++---- encoding/traditionalchinese/big5.go | 8 ++++---- encoding/traditionalchinese/maketables.go | 2 +- encoding/traditionalchinese/tables.go | 2 +- encoding/unicode/override.go | 2 +- encoding/unicode/unicode.go | 14 +++++++------- encoding/unicode/unicode_test.go | 8 ++++---- encoding/unicode/utf32/utf32.go | 8 ++++---- encoding/unicode/utf32/utf32_test.go | 6 +++--- feature/plural/example_test.go | 6 +++--- feature/plural/gen.go | 8 ++++---- feature/plural/message.go | 10 +++++----- feature/plural/message_test.go | 6 +++--- feature/plural/plural.go | 6 +++--- feature/plural/plural_test.go | 2 +- gen.go | 8 ++++---- internal/catmsg/catmsg.go | 4 ++-- internal/catmsg/catmsg_test.go | 6 +++--- internal/catmsg/codec.go | 2 +- internal/cldrtree/cldrtree.go | 6 +++--- internal/cldrtree/cldrtree_test.go | 8 ++++---- internal/cldrtree/generate.go | 4 ++-- internal/cldrtree/option.go | 2 +- internal/cldrtree/testdata/test1/output.go | 2 +- internal/cldrtree/testdata/test2/output.go | 2 +- internal/cldrtree/tree.go | 4 ++-- internal/colltab/collate_test.go | 6 +++--- internal/colltab/colltab.go | 4 ++-- internal/colltab/colltab_test.go | 2 +- internal/colltab/numeric_test.go | 2 +- internal/colltab/table.go | 2 +- internal/colltab/weighter.go | 2 +- internal/export/idna/common_test.go | 2 +- internal/export/idna/conformance_test.go | 6 +++--- internal/export/idna/example_test.go | 2 +- internal/export/idna/gen.go | 8 ++++---- internal/export/idna/gen10.0.0_test.go | 6 +++--- internal/export/idna/gen9.0.0_test.go | 6 +++--- internal/export/idna/gen_common.go | 2 +- internal/export/idna/idna10.0.0.go | 8 ++++---- internal/export/idna/idna9.0.0.go | 6 +++--- internal/export/idna/idna_test.go | 2 +- internal/export/unicode/gen.go | 6 +++--- internal/export/unicode/unicode_test.go | 6 +++--- internal/format/format.go | 4 ++-- internal/gen/gen.go | 6 +++--- internal/internal.go | 4 ++-- internal/internal_test.go | 2 +- internal/language/compact/compact.go | 4 ++-- internal/language/compact/gen.go | 6 +++--- internal/language/compact/gen_index.go | 2 +- internal/language/compact/gen_parents.go | 8 ++++---- internal/language/compact/gen_test.go | 2 +- internal/language/compact/language.go | 2 +- internal/language/compact/language_test.go | 2 +- internal/language/compact/parse_test.go | 2 +- internal/language/compact/tables.go | 2 +- internal/language/gen.go | 8 ++++---- internal/language/language.go | 2 +- internal/language/language_test.go | 2 +- internal/language/lookup.go | 2 +- internal/language/lookup_test.go | 2 +- internal/language/parse.go | 2 +- internal/language/parse_test.go | 2 +- internal/language/tables.go | 2 +- internal/match.go | 2 +- internal/match_test.go | 2 +- internal/number/common.go | 2 +- internal/number/format.go | 2 +- internal/number/format_test.go | 2 +- internal/number/gen.go | 14 +++++++------- internal/number/gen_common.go | 2 +- internal/number/number.go | 4 ++-- internal/number/number_test.go | 4 ++-- internal/number/tables.go | 2 +- internal/number/tables_test.go | 10 +++++----- internal/tag/tag.go | 2 +- internal/testtext/codesize.go | 2 +- internal/testtext/flag.go | 2 +- internal/testtext/text.go | 2 +- internal/triegen/example_compact_test.go | 2 +- internal/triegen/example_test.go | 2 +- internal/triegen/triegen.go | 2 +- internal/ucd/example_test.go | 2 +- internal/ucd/ucd.go | 2 +- language/coverage.go | 2 +- language/coverage_test.go | 2 +- language/display/dict_test.go | 6 +++--- language/display/display.go | 8 ++++---- language/display/display_test.go | 6 +++--- language/display/examples_test.go | 6 +++--- language/display/lookup.go | 2 +- language/display/maketables.go | 6 +++--- language/doc.go | 2 +- language/examples_test.go | 2 +- language/gen.go | 6 +++--- language/httpexample_test.go | 2 +- language/language.go | 4 ++-- language/match.go | 2 +- language/match_test.go | 4 ++-- language/parse.go | 2 +- language/parse_test.go | 2 +- language/tags.go | 2 +- message/catalog.go | 4 ++-- message/catalog/catalog.go | 8 ++++---- message/catalog/catalog_test.go | 4 ++-- message/catalog/dict.go | 6 +++--- message/catalog/go19.go | 2 +- message/catalog/gopre19.go | 2 +- message/catalog_test.go | 4 ++-- message/examples_test.go | 4 ++-- message/fmt_test.go | 2 +- message/format.go | 2 +- message/message.go | 10 +++++----- message/message_test.go | 8 ++++---- message/pipeline/extract.go | 4 ++-- message/pipeline/generate.go | 18 +++++++++--------- message/pipeline/message.go | 2 +- message/pipeline/pipeline.go | 6 +++--- message/pipeline/pipeline_test.go | 2 +- message/pipeline/rewrite.go | 4 ++-- message/pipeline/testdata/ssa/catalog_gen.go | 6 +++--- message/pipeline/testdata/ssa/ssa.go | 4 ++-- message/pipeline/testdata/test1/catalog_gen.go | 6 +++--- .../pipeline/testdata/test1/catalog_test.go | 2 +- message/pipeline/testdata/test1/test1.go | 2 +- message/print.go | 12 ++++++------ number/examples_test.go | 6 +++--- number/format.go | 8 ++++---- number/format_test.go | 6 +++--- number/number.go | 2 +- number/number_test.go | 4 ++-- number/option.go | 4 ++-- runes/cond.go | 2 +- runes/cond_test.go | 6 +++--- runes/example_test.go | 8 ++++---- runes/runes.go | 4 ++-- runes/runes_test.go | 4 ++-- search/index.go | 2 +- search/pattern.go | 2 +- search/pattern_test.go | 2 +- search/search.go | 6 +++--- secure/bidirule/bench_test.go | 2 +- secure/bidirule/bidirule.go | 4 ++-- secure/bidirule/bidirule10.0.0_test.go | 4 ++-- secure/bidirule/bidirule9.0.0_test.go | 4 ++-- secure/bidirule/bidirule_test.go | 4 ++-- secure/doc.go | 2 +- secure/precis/benchmark_test.go | 2 +- secure/precis/class_test.go | 2 +- secure/precis/doc.go | 2 +- secure/precis/enforce10.0.0_test.go | 4 ++-- secure/precis/enforce9.0.0_test.go | 4 ++-- secure/precis/enforce_test.go | 4 ++-- secure/precis/gen.go | 10 +++++----- secure/precis/nickname.go | 2 +- secure/precis/options.go | 10 +++++----- secure/precis/profile.go | 12 ++++++------ secure/precis/profile_test.go | 4 ++-- secure/precis/profiles.go | 6 +++--- secure/precis/tables_test.go | 4 ++-- secure/precis/transformer.go | 2 +- transform/examples_test.go | 4 ++-- transform/transform.go | 2 +- transform/transform_test.go | 2 +- unicode/bidi/bidi.go | 2 +- unicode/bidi/core_test.go | 8 ++++---- unicode/bidi/gen.go | 6 +++--- unicode/bidi/gen_ranges.go | 6 +++--- unicode/bidi/ranges_test.go | 6 +++--- unicode/bidi/tables_test.go | 6 +++--- unicode/cldr/cldr.go | 2 +- unicode/cldr/examples_test.go | 4 ++-- unicode/cldr/makexml.go | 2 +- unicode/norm/example_iter_test.go | 2 +- unicode/norm/example_test.go | 2 +- unicode/norm/maketables.go | 6 +++--- unicode/norm/normalize.go | 4 ++-- unicode/norm/normalize_test.go | 6 +++--- unicode/norm/transform.go | 2 +- unicode/norm/transform_test.go | 2 +- unicode/norm/ucd_test.go | 4 ++-- unicode/rangetable/gen.go | 10 +++++----- unicode/runenames/example_test.go | 2 +- unicode/runenames/gen.go | 6 +++--- unicode/runenames/runenames_test.go | 6 +++--- width/common_test.go | 4 ++-- width/example_test.go | 2 +- width/gen.go | 4 ++-- width/gen_common.go | 4 ++-- width/tables_test.go | 2 +- width/transform.go | 2 +- width/transform_test.go | 4 ++-- width/width.go | 4 ++-- 288 files changed, 660 insertions(+), 660 deletions(-) diff --git a/cases/cases.go b/cases/cases.go index 752cdf031..caf494ee5 100644 --- a/cases/cases.go +++ b/cases/cases.go @@ -5,11 +5,11 @@ //go:generate go run gen.go gen_trieval.go // Package cases provides general and language-specific case mappers. -package cases // import "golang.org/x/text/cases" +package cases // import "github.com/liquid-dev/text/cases" import ( - "golang.org/x/text/language" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/transform" ) // References: diff --git a/cases/context.go b/cases/context.go index e9aa9e193..68897b862 100644 --- a/cases/context.go +++ b/cases/context.go @@ -4,7 +4,7 @@ package cases -import "golang.org/x/text/transform" +import "github.com/liquid-dev/text/transform" // A context is used for iterating over source bytes, fetching case info and // writing to a destination buffer. diff --git a/cases/context_test.go b/cases/context_test.go index de6ba3f8c..b7cee3937 100644 --- a/cases/context_test.go +++ b/cases/context_test.go @@ -9,11 +9,11 @@ import ( "testing" "unicode" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/language" - "golang.org/x/text/transform" - "golang.org/x/text/unicode/norm" - "golang.org/x/text/unicode/rangetable" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/transform" + "github.com/liquid-dev/text/unicode/norm" + "github.com/liquid-dev/text/unicode/rangetable" ) // The following definitions are taken directly from Chapter 3 of The Unicode diff --git a/cases/example_test.go b/cases/example_test.go index 56e6e33ee..37c99affb 100644 --- a/cases/example_test.go +++ b/cases/example_test.go @@ -7,8 +7,8 @@ package cases_test import ( "fmt" - "golang.org/x/text/cases" - "golang.org/x/text/language" + "github.com/liquid-dev/text/cases" + "github.com/liquid-dev/text/language" ) func Example() { diff --git a/cases/fold.go b/cases/fold.go index 85cc434fa..dcb6b7e89 100644 --- a/cases/fold.go +++ b/cases/fold.go @@ -4,7 +4,7 @@ package cases -import "golang.org/x/text/transform" +import "github.com/liquid-dev/text/transform" type caseFolder struct{ transform.NopResetter } diff --git a/cases/fold_test.go b/cases/fold_test.go index ca939c7c1..e691f1d2a 100644 --- a/cases/fold_test.go +++ b/cases/fold_test.go @@ -7,7 +7,7 @@ package cases import ( "testing" - "golang.org/x/text/internal/testtext" + "github.com/liquid-dev/text/internal/testtext" ) var foldTestCases = []string{ diff --git a/cases/gen.go b/cases/gen.go index e7bccc8be..6255f8c65 100644 --- a/cases/gen.go +++ b/cases/gen.go @@ -22,10 +22,10 @@ import ( "strings" "unicode" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/triegen" - "golang.org/x/text/internal/ucd" - "golang.org/x/text/unicode/norm" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/triegen" + "github.com/liquid-dev/text/internal/ucd" + "github.com/liquid-dev/text/unicode/norm" ) func main() { diff --git a/cases/icu_test.go b/cases/icu_test.go index e2b0adafd..e66571fb7 100644 --- a/cases/icu_test.go +++ b/cases/icu_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/language" - "golang.org/x/text/unicode/norm" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/unicode/norm" ) func TestICUConformance(t *testing.T) { diff --git a/cases/map.go b/cases/map.go index 0f7c6a14b..e2855ed59 100644 --- a/cases/map.go +++ b/cases/map.go @@ -13,10 +13,10 @@ import ( "unicode" "unicode/utf8" - "golang.org/x/text/internal" - "golang.org/x/text/language" - "golang.org/x/text/transform" - "golang.org/x/text/unicode/norm" + "github.com/liquid-dev/text/internal" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/transform" + "github.com/liquid-dev/text/unicode/norm" ) // A mapFunc takes a context set to the current rune and writes the mapped diff --git a/cases/map_test.go b/cases/map_test.go index 8cfb89e59..aa1c3248c 100644 --- a/cases/map_test.go +++ b/cases/map_test.go @@ -12,10 +12,10 @@ import ( "testing" "unicode/utf8" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/language" - "golang.org/x/text/transform" - "golang.org/x/text/unicode/norm" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/transform" + "github.com/liquid-dev/text/unicode/norm" ) type testCase struct { diff --git a/cmd/gotext/examples/extract/catalog.go b/cmd/gotext/examples/extract/catalog.go index bc6130a69..82e993938 100644 --- a/cmd/gotext/examples/extract/catalog.go +++ b/cmd/gotext/examples/extract/catalog.go @@ -3,9 +3,9 @@ package main import ( - "golang.org/x/text/language" - "golang.org/x/text/message" - "golang.org/x/text/message/catalog" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message" + "github.com/liquid-dev/text/message/catalog" ) type dictionary struct { diff --git a/cmd/gotext/examples/extract/main.go b/cmd/gotext/examples/extract/main.go index 414b4531a..00b259dc4 100644 --- a/cmd/gotext/examples/extract/main.go +++ b/cmd/gotext/examples/extract/main.go @@ -7,8 +7,8 @@ package main //go:generate gotext update -out catalog.go import ( - "golang.org/x/text/language" - "golang.org/x/text/message" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message" ) func main() { diff --git a/cmd/gotext/examples/extract_http/catalog_gen.go b/cmd/gotext/examples/extract_http/catalog_gen.go index 2c410dcdb..896331a99 100644 --- a/cmd/gotext/examples/extract_http/catalog_gen.go +++ b/cmd/gotext/examples/extract_http/catalog_gen.go @@ -3,9 +3,9 @@ package main import ( - "golang.org/x/text/language" - "golang.org/x/text/message" - "golang.org/x/text/message/catalog" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message" + "github.com/liquid-dev/text/message/catalog" ) type dictionary struct { diff --git a/cmd/gotext/examples/extract_http/main.go b/cmd/gotext/examples/extract_http/main.go index b5eb3b334..b1df14940 100644 --- a/cmd/gotext/examples/extract_http/main.go +++ b/cmd/gotext/examples/extract_http/main.go @@ -9,7 +9,7 @@ package main import ( "net/http" - "golang.org/x/text/cmd/gotext/examples/extract_http/pkg" + "github.com/liquid-dev/text/cmd/gotext/examples/extract_http/pkg" ) func main() { diff --git a/cmd/gotext/examples/extract_http/pkg/pkg.go b/cmd/gotext/examples/extract_http/pkg/pkg.go index 7b4463488..9516da21c 100644 --- a/cmd/gotext/examples/extract_http/pkg/pkg.go +++ b/cmd/gotext/examples/extract_http/pkg/pkg.go @@ -7,8 +7,8 @@ package pkg import ( "net/http" - "golang.org/x/text/language" - "golang.org/x/text/message" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message" ) var matcher = language.NewMatcher(message.DefaultCatalog.Languages()) diff --git a/cmd/gotext/examples/rewrite/main.go b/cmd/gotext/examples/rewrite/main.go index 2fada451e..caaf30f57 100644 --- a/cmd/gotext/examples/rewrite/main.go +++ b/cmd/gotext/examples/rewrite/main.go @@ -7,8 +7,8 @@ package main import ( "fmt" - "golang.org/x/text/language" - "golang.org/x/text/message" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message" ) func main() { diff --git a/cmd/gotext/examples/rewrite/printer.go b/cmd/gotext/examples/rewrite/printer.go index 9ed055620..90faaf67a 100644 --- a/cmd/gotext/examples/rewrite/printer.go +++ b/cmd/gotext/examples/rewrite/printer.go @@ -7,8 +7,8 @@ package main import ( - "golang.org/x/text/language" - "golang.org/x/text/message" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message" ) // The printer defined here will be picked up by the first print statement diff --git a/cmd/gotext/extract.go b/cmd/gotext/extract.go index 103d7e600..54f1d8ec8 100644 --- a/cmd/gotext/extract.go +++ b/cmd/gotext/extract.go @@ -5,7 +5,7 @@ package main import ( - "golang.org/x/text/message/pipeline" + "github.com/liquid-dev/text/message/pipeline" ) // TODO: diff --git a/cmd/gotext/generate.go b/cmd/gotext/generate.go index 36820df8a..ac7dc7157 100644 --- a/cmd/gotext/generate.go +++ b/cmd/gotext/generate.go @@ -5,7 +5,7 @@ package main import ( - "golang.org/x/text/message/pipeline" + "github.com/liquid-dev/text/message/pipeline" ) func init() { diff --git a/cmd/gotext/main.go b/cmd/gotext/main.go index f31dd4fbd..6da8c813a 100644 --- a/cmd/gotext/main.go +++ b/cmd/gotext/main.go @@ -25,9 +25,9 @@ import ( "unicode" "unicode/utf8" - "golang.org/x/text/message/pipeline" + "github.com/liquid-dev/text/message/pipeline" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" "golang.org/x/tools/go/buildutil" ) diff --git a/cmd/gotext/rewrite.go b/cmd/gotext/rewrite.go index 9702ca7fc..ddabfb498 100644 --- a/cmd/gotext/rewrite.go +++ b/cmd/gotext/rewrite.go @@ -8,10 +8,10 @@ import ( "io" "os" - "golang.org/x/text/message/pipeline" + "github.com/liquid-dev/text/message/pipeline" ) -const printerType = "golang.org/x/text/message.Printer" +const printerType = "github.com/liquid-dev/text/message.Printer" // TODO: // - merge information into existing files diff --git a/cmd/gotext/update.go b/cmd/gotext/update.go index 1260750cc..f4880bbdc 100644 --- a/cmd/gotext/update.go +++ b/cmd/gotext/update.go @@ -5,7 +5,7 @@ package main import ( - "golang.org/x/text/message/pipeline" + "github.com/liquid-dev/text/message/pipeline" ) // TODO: diff --git a/collate/build/builder.go b/collate/build/builder.go index 092a4b506..d72312700 100644 --- a/collate/build/builder.go +++ b/collate/build/builder.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -package build // import "golang.org/x/text/collate/build" +package build // import "github.com/liquid-dev/text/collate/build" import ( "fmt" @@ -12,9 +12,9 @@ import ( "strings" "unicode/utf8" - "golang.org/x/text/internal/colltab" - "golang.org/x/text/language" - "golang.org/x/text/unicode/norm" + "github.com/liquid-dev/text/internal/colltab" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/unicode/norm" ) // TODO: optimizations: diff --git a/collate/build/colelem.go b/collate/build/colelem.go index 04fc3bfb7..923a14139 100644 --- a/collate/build/colelem.go +++ b/collate/build/colelem.go @@ -8,7 +8,7 @@ import ( "fmt" "unicode" - "golang.org/x/text/internal/colltab" + "github.com/liquid-dev/text/internal/colltab" ) const ( diff --git a/collate/build/colelem_test.go b/collate/build/colelem_test.go index d0c8d07d8..9a9b5f79a 100644 --- a/collate/build/colelem_test.go +++ b/collate/build/colelem_test.go @@ -7,7 +7,7 @@ package build import ( "testing" - "golang.org/x/text/internal/colltab" + "github.com/liquid-dev/text/internal/colltab" ) type ceTest struct { diff --git a/collate/build/contract.go b/collate/build/contract.go index e2df64f0c..8508e4e9c 100644 --- a/collate/build/contract.go +++ b/collate/build/contract.go @@ -11,7 +11,7 @@ import ( "sort" "strings" - "golang.org/x/text/internal/colltab" + "github.com/liquid-dev/text/internal/colltab" ) // This file contains code for detecting contractions and generating diff --git a/collate/build/contract_test.go b/collate/build/contract_test.go index 2e0eaecd5..3d26b9b9a 100644 --- a/collate/build/contract_test.go +++ b/collate/build/contract_test.go @@ -9,7 +9,7 @@ import ( "sort" "testing" - "golang.org/x/text/internal/colltab" + "github.com/liquid-dev/text/internal/colltab" ) var largetosmall = []stridx{ diff --git a/collate/build/order.go b/collate/build/order.go index 23fcf67b4..b07cde00a 100644 --- a/collate/build/order.go +++ b/collate/build/order.go @@ -11,8 +11,8 @@ import ( "strings" "unicode" - "golang.org/x/text/internal/colltab" - "golang.org/x/text/unicode/norm" + "github.com/liquid-dev/text/internal/colltab" + "github.com/liquid-dev/text/unicode/norm" ) type logicalAnchor int diff --git a/collate/build/order_test.go b/collate/build/order_test.go index 0e174bfbd..aaa9a4223 100644 --- a/collate/build/order_test.go +++ b/collate/build/order_test.go @@ -8,7 +8,7 @@ import ( "strconv" "testing" - "golang.org/x/text/internal/colltab" + "github.com/liquid-dev/text/internal/colltab" ) type entryTest struct { diff --git a/collate/build/table.go b/collate/build/table.go index 7eea7a63f..3ee154a50 100644 --- a/collate/build/table.go +++ b/collate/build/table.go @@ -9,7 +9,7 @@ import ( "io" "reflect" - "golang.org/x/text/internal/colltab" + "github.com/liquid-dev/text/internal/colltab" ) // table is an intermediate structure that roughly resembles the table in collate. diff --git a/collate/collate.go b/collate/collate.go index d8c23cb69..0eae37e81 100644 --- a/collate/collate.go +++ b/collate/collate.go @@ -8,14 +8,14 @@ // Package collate contains types for comparing and sorting Unicode strings // according to a given collation order. -package collate // import "golang.org/x/text/collate" +package collate // import "github.com/liquid-dev/text/collate" import ( "bytes" "strings" - "golang.org/x/text/internal/colltab" - "golang.org/x/text/language" + "github.com/liquid-dev/text/internal/colltab" + "github.com/liquid-dev/text/language" ) // Collator provides functionality for comparing strings for a given diff --git a/collate/collate_test.go b/collate/collate_test.go index 0e78b96fa..9fceb8e58 100644 --- a/collate/collate_test.go +++ b/collate/collate_test.go @@ -8,8 +8,8 @@ import ( "bytes" "testing" - "golang.org/x/text/internal/colltab" - "golang.org/x/text/language" + "github.com/liquid-dev/text/internal/colltab" + "github.com/liquid-dev/text/language" ) type weightsTest struct { diff --git a/collate/export_test.go b/collate/export_test.go index 69bfeaf1a..8728eabdf 100644 --- a/collate/export_test.go +++ b/collate/export_test.go @@ -10,7 +10,7 @@ package collate import ( "fmt" - "golang.org/x/text/internal/colltab" + "github.com/liquid-dev/text/internal/colltab" ) const ( diff --git a/collate/index.go b/collate/index.go index 535fb5402..046599a99 100644 --- a/collate/index.go +++ b/collate/index.go @@ -4,7 +4,7 @@ package collate -import "golang.org/x/text/internal/colltab" +import "github.com/liquid-dev/text/internal/colltab" const blockSize = 64 diff --git a/collate/maketables.go b/collate/maketables.go index 3b25d7bfa..c50b34ac2 100644 --- a/collate/maketables.go +++ b/collate/maketables.go @@ -25,12 +25,12 @@ import ( "strings" "unicode/utf8" - "golang.org/x/text/collate" - "golang.org/x/text/collate/build" - "golang.org/x/text/internal/colltab" - "golang.org/x/text/internal/gen" - "golang.org/x/text/language" - "golang.org/x/text/unicode/cldr" + "github.com/liquid-dev/text/collate" + "github.com/liquid-dev/text/collate/build" + "github.com/liquid-dev/text/internal/colltab" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/unicode/cldr" ) var ( diff --git a/collate/option.go b/collate/option.go index 19cb54675..98f382465 100644 --- a/collate/option.go +++ b/collate/option.go @@ -7,9 +7,9 @@ package collate import ( "sort" - "golang.org/x/text/internal/colltab" - "golang.org/x/text/language" - "golang.org/x/text/unicode/norm" + "github.com/liquid-dev/text/internal/colltab" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/unicode/norm" ) // newCollator creates a new collator with default options configured. diff --git a/collate/option_test.go b/collate/option_test.go index 0f6ba9bc8..dbee9cc22 100644 --- a/collate/option_test.go +++ b/collate/option_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "golang.org/x/text/internal/colltab" - "golang.org/x/text/language" + "github.com/liquid-dev/text/internal/colltab" + "github.com/liquid-dev/text/language" ) var ( diff --git a/collate/reg_test.go b/collate/reg_test.go index 4d3598485..bdb429307 100644 --- a/collate/reg_test.go +++ b/collate/reg_test.go @@ -19,9 +19,9 @@ import ( "testing" "unicode/utf8" - "golang.org/x/text/collate/build" - "golang.org/x/text/internal/gen" - "golang.org/x/text/language" + "github.com/liquid-dev/text/collate/build" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/language" ) var long = flag.Bool("long", false, diff --git a/collate/sort_test.go b/collate/sort_test.go index d9e7f31cc..91e737ee0 100644 --- a/collate/sort_test.go +++ b/collate/sort_test.go @@ -8,8 +8,8 @@ import ( "fmt" "testing" - "golang.org/x/text/collate" - "golang.org/x/text/language" + "github.com/liquid-dev/text/collate" + "github.com/liquid-dev/text/language" ) func ExampleCollator_Strings() { diff --git a/collate/table_test.go b/collate/table_test.go index 3a6b12fd6..a6e38df78 100644 --- a/collate/table_test.go +++ b/collate/table_test.go @@ -7,9 +7,9 @@ package collate import ( "testing" - "golang.org/x/text/collate/build" - "golang.org/x/text/internal/colltab" - "golang.org/x/text/unicode/norm" + "github.com/liquid-dev/text/collate/build" + "github.com/liquid-dev/text/internal/colltab" + "github.com/liquid-dev/text/unicode/norm" ) type ColElems []Weights diff --git a/collate/tools/colcmp/col.go b/collate/tools/colcmp/col.go index dc22d2eef..ab44c67fc 100644 --- a/collate/tools/colcmp/col.go +++ b/collate/tools/colcmp/col.go @@ -8,8 +8,8 @@ import ( "log" "unicode/utf16" - "golang.org/x/text/collate" - "golang.org/x/text/language" + "github.com/liquid-dev/text/collate" + "github.com/liquid-dev/text/language" ) // Input holds an input string in both UTF-8 and UTF-16 format. diff --git a/collate/tools/colcmp/colcmp.go b/collate/tools/colcmp/colcmp.go index ebd6012dd..413634832 100644 --- a/collate/tools/colcmp/colcmp.go +++ b/collate/tools/colcmp/colcmp.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -package main // import "golang.org/x/text/collate/tools/colcmp" +package main // import "github.com/liquid-dev/text/collate/tools/colcmp" import ( "bytes" @@ -18,7 +18,7 @@ import ( "text/template" "time" - "golang.org/x/text/unicode/norm" + "github.com/liquid-dev/text/unicode/norm" ) var ( diff --git a/collate/tools/colcmp/gen.go b/collate/tools/colcmp/gen.go index 795be132e..fbeff6797 100644 --- a/collate/tools/colcmp/gen.go +++ b/collate/tools/colcmp/gen.go @@ -12,8 +12,8 @@ import ( "unicode/utf16" "unicode/utf8" - "golang.org/x/text/language" - "golang.org/x/text/unicode/norm" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/unicode/norm" ) // TODO: replace with functionality in language package. diff --git a/currency/common.go b/currency/common.go index fef15be55..586b77ad8 100644 --- a/currency/common.go +++ b/currency/common.go @@ -5,7 +5,7 @@ package currency import ( "time" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) // This file contains code common to gen.go and the package code. diff --git a/currency/currency.go b/currency/currency.go index 598ddeff4..ea9ca650d 100644 --- a/currency/currency.go +++ b/currency/currency.go @@ -8,14 +8,14 @@ // // NOTE: the formatting functionality is currently under development and may // change without notice. -package currency // import "golang.org/x/text/currency" +package currency // import "github.com/liquid-dev/text/currency" import ( "errors" "sort" - "golang.org/x/text/internal/tag" - "golang.org/x/text/language" + "github.com/liquid-dev/text/internal/tag" + "github.com/liquid-dev/text/language" ) // TODO: diff --git a/currency/currency_test.go b/currency/currency_test.go index 6c05ecbf6..70a8486c6 100644 --- a/currency/currency_test.go +++ b/currency/currency_test.go @@ -8,8 +8,8 @@ import ( "fmt" "testing" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/language" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/language" ) var ( @@ -141,7 +141,7 @@ func TestKindRounding(t *testing.T) { const body = `package main import ( "fmt" - "golang.org/x/text/currency" + "github.com/liquid-dev/text/currency" ) func main() { %s diff --git a/currency/example_test.go b/currency/example_test.go index 519c87228..9f715e031 100644 --- a/currency/example_test.go +++ b/currency/example_test.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "golang.org/x/text/currency" + "github.com/liquid-dev/text/currency" ) func ExampleQuery() { diff --git a/currency/format.go b/currency/format.go index 11152632a..abcb4aa23 100644 --- a/currency/format.go +++ b/currency/format.go @@ -9,8 +9,8 @@ import ( "io" "sort" - "golang.org/x/text/internal/format" - "golang.org/x/text/internal/language/compact" + "github.com/liquid-dev/text/internal/format" + "github.com/liquid-dev/text/internal/language/compact" ) // Amount is an amount-currency unit pair. diff --git a/currency/format_test.go b/currency/format_test.go index 0aa0d58af..7ea1ba58c 100644 --- a/currency/format_test.go +++ b/currency/format_test.go @@ -7,8 +7,8 @@ package currency import ( "testing" - "golang.org/x/text/language" - "golang.org/x/text/message" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message" ) var ( diff --git a/currency/gen.go b/currency/gen.go index da7712fc5..092465d5b 100644 --- a/currency/gen.go +++ b/currency/gen.go @@ -18,12 +18,12 @@ import ( "strings" "time" - "golang.org/x/text/internal/language/compact" + "github.com/liquid-dev/text/internal/language/compact" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/tag" - "golang.org/x/text/language" - "golang.org/x/text/unicode/cldr" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/tag" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/unicode/cldr" ) var ( @@ -56,7 +56,7 @@ func main() { w := gen.NewCodeWriter() defer w.WriteGoFile(*outputFile, "currency") - fmt.Fprintln(w, `import "golang.org/x/text/internal/tag"`) + fmt.Fprintln(w, `import "github.com/liquid-dev/text/internal/tag"`) gen.WriteCLDRVersion(w) b := &builder{} diff --git a/currency/gen_common.go b/currency/gen_common.go index e1cea2494..9f71d28d8 100644 --- a/currency/gen_common.go +++ b/currency/gen_common.go @@ -9,7 +9,7 @@ package main import ( "time" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) // This file contains code common to gen.go and the package code. diff --git a/currency/query.go b/currency/query.go index 7bf9430a6..74fa8e61c 100644 --- a/currency/query.go +++ b/currency/query.go @@ -8,7 +8,7 @@ import ( "sort" "time" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) // QueryIter represents a set of Units. The default set includes all Units that diff --git a/currency/query_test.go b/currency/query_test.go index 6caea9dbb..093a9f1b3 100644 --- a/currency/query_test.go +++ b/currency/query_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) func TestQuery(t *testing.T) { diff --git a/currency/tables.go b/currency/tables.go index 94c3f15fc..4e7c2e63a 100644 --- a/currency/tables.go +++ b/currency/tables.go @@ -2,7 +2,7 @@ package currency -import "golang.org/x/text/internal/tag" +import "github.com/liquid-dev/text/internal/tag" // CLDRVersion is the CLDR version from which the tables in this package are derived. const CLDRVersion = "32" diff --git a/currency/tables_test.go b/currency/tables_test.go index 779f5001d..cff5c1285 100644 --- a/currency/tables_test.go +++ b/currency/tables_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/language" - "golang.org/x/text/message" - "golang.org/x/text/unicode/cldr" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message" + "github.com/liquid-dev/text/unicode/cldr" ) var draft = flag.String("draft", diff --git a/date/gen.go b/date/gen.go index 1fff91905..d7e8f4767 100644 --- a/date/gen.go +++ b/date/gen.go @@ -12,10 +12,10 @@ import ( "strconv" "strings" - "golang.org/x/text/internal/cldrtree" - "golang.org/x/text/internal/gen" - "golang.org/x/text/language" - "golang.org/x/text/unicode/cldr" + "github.com/liquid-dev/text/internal/cldrtree" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/unicode/cldr" ) var ( diff --git a/date/gen_test.go b/date/gen_test.go index b6b9159f6..3b5bd8f2e 100644 --- a/date/gen_test.go +++ b/date/gen_test.go @@ -9,12 +9,12 @@ import ( "strings" "testing" - "golang.org/x/text/internal/cldrtree" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/language/compact" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/language" - "golang.org/x/text/unicode/cldr" + "github.com/liquid-dev/text/internal/cldrtree" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/language/compact" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/unicode/cldr" ) func TestTables(t *testing.T) { diff --git a/date/tables.go b/date/tables.go index 7432964a0..59be3ee02 100644 --- a/date/tables.go +++ b/date/tables.go @@ -2,7 +2,7 @@ package date -import "golang.org/x/text/internal/cldrtree" +import "github.com/liquid-dev/text/internal/cldrtree" var tree = &cldrtree.Tree{locales, indices, buckets} diff --git a/encoding/charmap/charmap.go b/encoding/charmap/charmap.go index e89ff0734..5fdc646f9 100644 --- a/encoding/charmap/charmap.go +++ b/encoding/charmap/charmap.go @@ -6,15 +6,15 @@ // Package charmap provides simple character encodings such as IBM Code Page 437 // and Windows 1252. -package charmap // import "golang.org/x/text/encoding/charmap" +package charmap // import "github.com/liquid-dev/text/encoding/charmap" import ( "unicode/utf8" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/internal" - "golang.org/x/text/encoding/internal/identifier" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/internal" + "github.com/liquid-dev/text/encoding/internal/identifier" + "github.com/liquid-dev/text/transform" ) // These encodings vary only in the way clients should interpret them. Their diff --git a/encoding/charmap/charmap_test.go b/encoding/charmap/charmap_test.go index 03dd76ebd..a81167811 100644 --- a/encoding/charmap/charmap_test.go +++ b/encoding/charmap/charmap_test.go @@ -7,10 +7,10 @@ package charmap import ( "testing" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/internal" - "golang.org/x/text/encoding/internal/enctest" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/internal" + "github.com/liquid-dev/text/encoding/internal/enctest" + "github.com/liquid-dev/text/transform" ) func dec(e encoding.Encoding) (dir string, t transform.Transformer, err error) { diff --git a/encoding/charmap/maketables.go b/encoding/charmap/maketables.go index f7941701e..ca7c94438 100644 --- a/encoding/charmap/maketables.go +++ b/encoding/charmap/maketables.go @@ -15,8 +15,8 @@ import ( "strings" "unicode/utf8" - "golang.org/x/text/encoding" - "golang.org/x/text/internal/gen" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/internal/gen" ) const ascii = "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f" + @@ -467,8 +467,8 @@ func main() { printf := func(s string, a ...interface{}) { fmt.Fprintf(w, s, a...) } printf("import (\n") - printf("\t\"golang.org/x/text/encoding\"\n") - printf("\t\"golang.org/x/text/encoding/internal/identifier\"\n") + printf("\t\"github.com/liquid-dev/text/encoding\"\n") + printf("\t\"github.com/liquid-dev/text/encoding/internal/identifier\"\n") printf(")\n\n") for _, e := range encodings { varNames := strings.Split(e.varName, ",") diff --git a/encoding/charmap/tables.go b/encoding/charmap/tables.go index cf7281e9e..a69634174 100644 --- a/encoding/charmap/tables.go +++ b/encoding/charmap/tables.go @@ -3,8 +3,8 @@ package charmap import ( - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/internal/identifier" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/internal/identifier" ) // CodePage037 is the IBM Code Page 037 encoding. diff --git a/encoding/encoding.go b/encoding/encoding.go index a0bd7cd4d..ce6da6f10 100644 --- a/encoding/encoding.go +++ b/encoding/encoding.go @@ -8,7 +8,7 @@ // Encoding implementations are provided in other packages, such as // golang.org/x/text/encoding/charmap and // golang.org/x/text/encoding/japanese. -package encoding // import "golang.org/x/text/encoding" +package encoding // import "github.com/liquid-dev/text/encoding" import ( "errors" @@ -16,8 +16,8 @@ import ( "strconv" "unicode/utf8" - "golang.org/x/text/encoding/internal/identifier" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding/internal/identifier" + "github.com/liquid-dev/text/transform" ) // TODO: diff --git a/encoding/encoding_test.go b/encoding/encoding_test.go index 173814762..303c3e24b 100644 --- a/encoding/encoding_test.go +++ b/encoding/encoding_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/charmap" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/charmap" + "github.com/liquid-dev/text/transform" ) func TestEncodeInvalidUTF8(t *testing.T) { diff --git a/encoding/example_test.go b/encoding/example_test.go index 4f923530f..d95ee8d8d 100644 --- a/encoding/example_test.go +++ b/encoding/example_test.go @@ -10,10 +10,10 @@ import ( "os" "strings" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/charmap" - "golang.org/x/text/encoding/unicode" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/charmap" + "github.com/liquid-dev/text/encoding/unicode" + "github.com/liquid-dev/text/transform" ) func ExampleDecodeWindows1252() { diff --git a/encoding/htmlindex/gen.go b/encoding/htmlindex/gen.go index ac6b4a77f..3e1d39a21 100644 --- a/encoding/htmlindex/gen.go +++ b/encoding/htmlindex/gen.go @@ -13,7 +13,7 @@ import ( "log" "strings" - "golang.org/x/text/internal/gen" + "github.com/liquid-dev/text/internal/gen" ) type group struct { diff --git a/encoding/htmlindex/htmlindex.go b/encoding/htmlindex/htmlindex.go index bdc7d15dd..c8cad0ac4 100644 --- a/encoding/htmlindex/htmlindex.go +++ b/encoding/htmlindex/htmlindex.go @@ -26,9 +26,9 @@ import ( "strings" "sync" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/internal/identifier" - "golang.org/x/text/language" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/internal/identifier" + "github.com/liquid-dev/text/language" ) var ( diff --git a/encoding/htmlindex/htmlindex_test.go b/encoding/htmlindex/htmlindex_test.go index 3fdab0f49..5bf6e01b8 100644 --- a/encoding/htmlindex/htmlindex_test.go +++ b/encoding/htmlindex/htmlindex_test.go @@ -7,11 +7,11 @@ package htmlindex import ( "testing" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/charmap" - "golang.org/x/text/encoding/internal/identifier" - "golang.org/x/text/encoding/unicode" - "golang.org/x/text/language" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/charmap" + "github.com/liquid-dev/text/encoding/internal/identifier" + "github.com/liquid-dev/text/encoding/unicode" + "github.com/liquid-dev/text/language" ) func TestGet(t *testing.T) { diff --git a/encoding/htmlindex/map.go b/encoding/htmlindex/map.go index c61439045..655bc8350 100644 --- a/encoding/htmlindex/map.go +++ b/encoding/htmlindex/map.go @@ -5,14 +5,14 @@ package htmlindex import ( - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/charmap" - "golang.org/x/text/encoding/internal/identifier" - "golang.org/x/text/encoding/japanese" - "golang.org/x/text/encoding/korean" - "golang.org/x/text/encoding/simplifiedchinese" - "golang.org/x/text/encoding/traditionalchinese" - "golang.org/x/text/encoding/unicode" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/charmap" + "github.com/liquid-dev/text/encoding/internal/identifier" + "github.com/liquid-dev/text/encoding/japanese" + "github.com/liquid-dev/text/encoding/korean" + "github.com/liquid-dev/text/encoding/simplifiedchinese" + "github.com/liquid-dev/text/encoding/traditionalchinese" + "github.com/liquid-dev/text/encoding/unicode" ) // mibMap maps a MIB identifier to an htmlEncoding index. diff --git a/encoding/ianaindex/example_test.go b/encoding/ianaindex/example_test.go index e2a3a7ef6..7a150450f 100644 --- a/encoding/ianaindex/example_test.go +++ b/encoding/ianaindex/example_test.go @@ -7,8 +7,8 @@ package ianaindex_test import ( "fmt" - "golang.org/x/text/encoding/charmap" - "golang.org/x/text/encoding/ianaindex" + "github.com/liquid-dev/text/encoding/charmap" + "github.com/liquid-dev/text/encoding/ianaindex" ) func ExampleIndex() { diff --git a/encoding/ianaindex/gen.go b/encoding/ianaindex/gen.go index 1b61b820d..6d2d37464 100644 --- a/encoding/ianaindex/gen.go +++ b/encoding/ianaindex/gen.go @@ -15,8 +15,8 @@ import ( "strconv" "strings" - "golang.org/x/text/encoding/internal/identifier" - "golang.org/x/text/internal/gen" + "github.com/liquid-dev/text/encoding/internal/identifier" + "github.com/liquid-dev/text/internal/gen" ) type registry struct { @@ -74,7 +74,7 @@ func main() { w := gen.NewCodeWriter() - fmt.Fprintln(w, `import "golang.org/x/text/encoding/internal/identifier"`) + fmt.Fprintln(w, `import "github.com/liquid-dev/text/encoding/internal/identifier"`) writeIndex(w, x) diff --git a/encoding/ianaindex/ianaindex.go b/encoding/ianaindex/ianaindex.go index 49b30704a..f2fe4efc0 100644 --- a/encoding/ianaindex/ianaindex.go +++ b/encoding/ianaindex/ianaindex.go @@ -16,14 +16,14 @@ import ( "sort" "strings" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/charmap" - "golang.org/x/text/encoding/internal/identifier" - "golang.org/x/text/encoding/japanese" - "golang.org/x/text/encoding/korean" - "golang.org/x/text/encoding/simplifiedchinese" - "golang.org/x/text/encoding/traditionalchinese" - "golang.org/x/text/encoding/unicode" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/charmap" + "github.com/liquid-dev/text/encoding/internal/identifier" + "github.com/liquid-dev/text/encoding/japanese" + "github.com/liquid-dev/text/encoding/korean" + "github.com/liquid-dev/text/encoding/simplifiedchinese" + "github.com/liquid-dev/text/encoding/traditionalchinese" + "github.com/liquid-dev/text/encoding/unicode" ) // TODO: remove the "Status... incomplete" in the package doc comment. diff --git a/encoding/ianaindex/ianaindex_test.go b/encoding/ianaindex/ianaindex_test.go index 20a2131f4..6bc668f32 100644 --- a/encoding/ianaindex/ianaindex_test.go +++ b/encoding/ianaindex/ianaindex_test.go @@ -7,14 +7,14 @@ package ianaindex import ( "testing" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/charmap" - "golang.org/x/text/encoding/internal/identifier" - "golang.org/x/text/encoding/japanese" - "golang.org/x/text/encoding/korean" - "golang.org/x/text/encoding/simplifiedchinese" - "golang.org/x/text/encoding/traditionalchinese" - "golang.org/x/text/encoding/unicode" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/charmap" + "github.com/liquid-dev/text/encoding/internal/identifier" + "github.com/liquid-dev/text/encoding/japanese" + "github.com/liquid-dev/text/encoding/korean" + "github.com/liquid-dev/text/encoding/simplifiedchinese" + "github.com/liquid-dev/text/encoding/traditionalchinese" + "github.com/liquid-dev/text/encoding/unicode" ) var All = [][]encoding.Encoding{ diff --git a/encoding/ianaindex/tables.go b/encoding/ianaindex/tables.go index cec6a0407..f398deae1 100644 --- a/encoding/ianaindex/tables.go +++ b/encoding/ianaindex/tables.go @@ -2,7 +2,7 @@ package ianaindex -import "golang.org/x/text/encoding/internal/identifier" +import "github.com/liquid-dev/text/encoding/internal/identifier" const ( enc3 = iota diff --git a/encoding/internal/enctest/enctest.go b/encoding/internal/enctest/enctest.go index 0cccae044..a4e443351 100644 --- a/encoding/internal/enctest/enctest.go +++ b/encoding/internal/enctest/enctest.go @@ -12,9 +12,9 @@ import ( "strings" "testing" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/internal/identifier" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/internal/identifier" + "github.com/liquid-dev/text/transform" ) // Encoder or Decoder diff --git a/encoding/internal/identifier/gen.go b/encoding/internal/identifier/gen.go index 26cfef9c6..7a74b0b90 100644 --- a/encoding/internal/identifier/gen.go +++ b/encoding/internal/identifier/gen.go @@ -14,7 +14,7 @@ import ( "log" "strings" - "golang.org/x/text/internal/gen" + "github.com/liquid-dev/text/internal/gen" ) type registry struct { diff --git a/encoding/internal/internal.go b/encoding/internal/internal.go index 75a5fd165..316bb5bfd 100644 --- a/encoding/internal/internal.go +++ b/encoding/internal/internal.go @@ -6,9 +6,9 @@ package internal import ( - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/internal/identifier" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/internal/identifier" + "github.com/liquid-dev/text/transform" ) // Encoding is an implementation of the Encoding interface that adds the String diff --git a/encoding/japanese/all.go b/encoding/japanese/all.go index 6cfa8de45..79ce22fba 100644 --- a/encoding/japanese/all.go +++ b/encoding/japanese/all.go @@ -5,7 +5,7 @@ package japanese import ( - "golang.org/x/text/encoding" + "github.com/liquid-dev/text/encoding" ) // All is a list of all defined encodings in this package. diff --git a/encoding/japanese/all_test.go b/encoding/japanese/all_test.go index 9cffe10dc..520edb6a3 100644 --- a/encoding/japanese/all_test.go +++ b/encoding/japanese/all_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/internal" - "golang.org/x/text/encoding/internal/enctest" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/internal" + "github.com/liquid-dev/text/encoding/internal/enctest" + "github.com/liquid-dev/text/transform" ) func dec(e encoding.Encoding) (dir string, t transform.Transformer, err error) { diff --git a/encoding/japanese/eucjp.go b/encoding/japanese/eucjp.go index 79313fa58..e9ef840e3 100644 --- a/encoding/japanese/eucjp.go +++ b/encoding/japanese/eucjp.go @@ -7,10 +7,10 @@ package japanese import ( "unicode/utf8" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/internal" - "golang.org/x/text/encoding/internal/identifier" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/internal" + "github.com/liquid-dev/text/encoding/internal/identifier" + "github.com/liquid-dev/text/transform" ) // EUCJP is the EUC-JP encoding. diff --git a/encoding/japanese/iso2022jp.go b/encoding/japanese/iso2022jp.go index 613226df5..f677d2e5f 100644 --- a/encoding/japanese/iso2022jp.go +++ b/encoding/japanese/iso2022jp.go @@ -7,10 +7,10 @@ package japanese import ( "unicode/utf8" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/internal" - "golang.org/x/text/encoding/internal/identifier" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/internal" + "github.com/liquid-dev/text/encoding/internal/identifier" + "github.com/liquid-dev/text/transform" ) // ISO2022JP is the ISO-2022-JP encoding. diff --git a/encoding/japanese/maketables.go b/encoding/japanese/maketables.go index 023957a67..361316366 100644 --- a/encoding/japanese/maketables.go +++ b/encoding/japanese/maketables.go @@ -29,7 +29,7 @@ type entry struct { func main() { fmt.Printf("// generated by go run maketables.go; DO NOT EDIT\n\n") fmt.Printf("// Package japanese provides Japanese encodings such as EUC-JP and Shift JIS.\n") - fmt.Printf(`package japanese // import "golang.org/x/text/encoding/japanese"` + "\n\n") + fmt.Printf(`package japanese // import "github.com/liquid-dev/text/encoding/japanese"` + "\n\n") reverse := [65536]entry{} for i := range reverse { diff --git a/encoding/japanese/shiftjis.go b/encoding/japanese/shiftjis.go index 61cc29ce2..b4640e65b 100644 --- a/encoding/japanese/shiftjis.go +++ b/encoding/japanese/shiftjis.go @@ -7,10 +7,10 @@ package japanese import ( "unicode/utf8" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/internal" - "golang.org/x/text/encoding/internal/identifier" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/internal" + "github.com/liquid-dev/text/encoding/internal/identifier" + "github.com/liquid-dev/text/transform" ) // ShiftJIS is the Shift JIS encoding, also known as Code Page 932 and diff --git a/encoding/japanese/tables.go b/encoding/japanese/tables.go index 8717b79ae..99177dd8e 100644 --- a/encoding/japanese/tables.go +++ b/encoding/japanese/tables.go @@ -1,7 +1,7 @@ // generated by go run maketables.go; DO NOT EDIT // Package japanese provides Japanese encodings such as EUC-JP and Shift JIS. -package japanese // import "golang.org/x/text/encoding/japanese" +package japanese // import "github.com/liquid-dev/text/encoding/japanese" // jis0208Decode is the decoding table from JIS 0208 code to Unicode. // It is defined at http://encoding.spec.whatwg.org/index-jis0208.txt diff --git a/encoding/korean/all_test.go b/encoding/korean/all_test.go index 8225ce62a..ea055df20 100644 --- a/encoding/korean/all_test.go +++ b/encoding/korean/all_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/internal" - "golang.org/x/text/encoding/internal/enctest" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/internal" + "github.com/liquid-dev/text/encoding/internal/enctest" + "github.com/liquid-dev/text/transform" ) func dec(e encoding.Encoding) (dir string, t transform.Transformer, err error) { diff --git a/encoding/korean/euckr.go b/encoding/korean/euckr.go index 034337f5d..9c85604ed 100644 --- a/encoding/korean/euckr.go +++ b/encoding/korean/euckr.go @@ -7,10 +7,10 @@ package korean import ( "unicode/utf8" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/internal" - "golang.org/x/text/encoding/internal/identifier" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/internal" + "github.com/liquid-dev/text/encoding/internal/identifier" + "github.com/liquid-dev/text/transform" ) // All is a list of all defined encodings in this package. diff --git a/encoding/korean/maketables.go b/encoding/korean/maketables.go index c84034fb6..f646d3ecd 100644 --- a/encoding/korean/maketables.go +++ b/encoding/korean/maketables.go @@ -21,7 +21,7 @@ import ( func main() { fmt.Printf("// generated by go run maketables.go; DO NOT EDIT\n\n") fmt.Printf("// Package korean provides Korean encodings such as EUC-KR.\n") - fmt.Printf(`package korean // import "golang.org/x/text/encoding/korean"` + "\n\n") + fmt.Printf(`package korean // import "github.com/liquid-dev/text/encoding/korean"` + "\n\n") res, err := http.Get("http://encoding.spec.whatwg.org/index-euc-kr.txt") if err != nil { diff --git a/encoding/korean/tables.go b/encoding/korean/tables.go index 0480e85c4..2c1d7fd59 100644 --- a/encoding/korean/tables.go +++ b/encoding/korean/tables.go @@ -1,7 +1,7 @@ // generated by go run maketables.go; DO NOT EDIT // Package korean provides Korean encodings such as EUC-KR. -package korean // import "golang.org/x/text/encoding/korean" +package korean // import "github.com/liquid-dev/text/encoding/korean" // decode is the decoding table from EUC-KR code to Unicode. // It is defined at http://encoding.spec.whatwg.org/index-euc-kr.txt diff --git a/encoding/simplifiedchinese/all.go b/encoding/simplifiedchinese/all.go index 5ecc526cf..69c89ae12 100644 --- a/encoding/simplifiedchinese/all.go +++ b/encoding/simplifiedchinese/all.go @@ -5,7 +5,7 @@ package simplifiedchinese import ( - "golang.org/x/text/encoding" + "github.com/liquid-dev/text/encoding" ) // All is a list of all defined encodings in this package. diff --git a/encoding/simplifiedchinese/all_test.go b/encoding/simplifiedchinese/all_test.go index b369da21a..c781f6161 100644 --- a/encoding/simplifiedchinese/all_test.go +++ b/encoding/simplifiedchinese/all_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/internal" - "golang.org/x/text/encoding/internal/enctest" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/internal" + "github.com/liquid-dev/text/encoding/internal/enctest" + "github.com/liquid-dev/text/transform" ) func dec(e encoding.Encoding) (dir string, t transform.Transformer, err error) { diff --git a/encoding/simplifiedchinese/gbk.go b/encoding/simplifiedchinese/gbk.go index b89c45b03..4a3de0b28 100644 --- a/encoding/simplifiedchinese/gbk.go +++ b/encoding/simplifiedchinese/gbk.go @@ -7,10 +7,10 @@ package simplifiedchinese import ( "unicode/utf8" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/internal" - "golang.org/x/text/encoding/internal/identifier" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/internal" + "github.com/liquid-dev/text/encoding/internal/identifier" + "github.com/liquid-dev/text/transform" ) var ( diff --git a/encoding/simplifiedchinese/hzgb2312.go b/encoding/simplifiedchinese/hzgb2312.go index eb3157f0b..686d8e858 100644 --- a/encoding/simplifiedchinese/hzgb2312.go +++ b/encoding/simplifiedchinese/hzgb2312.go @@ -7,10 +7,10 @@ package simplifiedchinese import ( "unicode/utf8" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/internal" - "golang.org/x/text/encoding/internal/identifier" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/internal" + "github.com/liquid-dev/text/encoding/internal/identifier" + "github.com/liquid-dev/text/transform" ) // HZGB2312 is the HZ-GB2312 encoding. diff --git a/encoding/simplifiedchinese/maketables.go b/encoding/simplifiedchinese/maketables.go index 55016c786..ec644c2ca 100644 --- a/encoding/simplifiedchinese/maketables.go +++ b/encoding/simplifiedchinese/maketables.go @@ -21,7 +21,7 @@ import ( func main() { fmt.Printf("// generated by go run maketables.go; DO NOT EDIT\n\n") fmt.Printf("// Package simplifiedchinese provides Simplified Chinese encodings such as GBK.\n") - fmt.Printf(`package simplifiedchinese // import "golang.org/x/text/encoding/simplifiedchinese"` + "\n\n") + fmt.Printf(`package simplifiedchinese // import "github.com/liquid-dev/text/encoding/simplifiedchinese"` + "\n\n") printGB18030() printGBK() diff --git a/encoding/simplifiedchinese/tables.go b/encoding/simplifiedchinese/tables.go index 415f52a11..f5148f2e8 100644 --- a/encoding/simplifiedchinese/tables.go +++ b/encoding/simplifiedchinese/tables.go @@ -1,7 +1,7 @@ // generated by go run maketables.go; DO NOT EDIT // Package simplifiedchinese provides Simplified Chinese encodings such as GBK. -package simplifiedchinese // import "golang.org/x/text/encoding/simplifiedchinese" +package simplifiedchinese // import "github.com/liquid-dev/text/encoding/simplifiedchinese" // gb18030 is the table from http://encoding.spec.whatwg.org/index-gb18030.txt var gb18030 = [...][2]uint16{ diff --git a/encoding/traditionalchinese/all_test.go b/encoding/traditionalchinese/all_test.go index 3825c7672..e551b84a8 100644 --- a/encoding/traditionalchinese/all_test.go +++ b/encoding/traditionalchinese/all_test.go @@ -10,10 +10,10 @@ import ( "strings" "testing" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/internal" - "golang.org/x/text/encoding/internal/enctest" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/internal" + "github.com/liquid-dev/text/encoding/internal/enctest" + "github.com/liquid-dev/text/transform" ) func dec(e encoding.Encoding) (dir string, t transform.Transformer, err error) { diff --git a/encoding/traditionalchinese/big5.go b/encoding/traditionalchinese/big5.go index 1fcddde08..2e71f0e99 100644 --- a/encoding/traditionalchinese/big5.go +++ b/encoding/traditionalchinese/big5.go @@ -7,10 +7,10 @@ package traditionalchinese import ( "unicode/utf8" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/internal" - "golang.org/x/text/encoding/internal/identifier" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/internal" + "github.com/liquid-dev/text/encoding/internal/identifier" + "github.com/liquid-dev/text/transform" ) // All is a list of all defined encodings in this package. diff --git a/encoding/traditionalchinese/maketables.go b/encoding/traditionalchinese/maketables.go index cf7fdb31a..4b4f68202 100644 --- a/encoding/traditionalchinese/maketables.go +++ b/encoding/traditionalchinese/maketables.go @@ -21,7 +21,7 @@ import ( func main() { fmt.Printf("// generated by go run maketables.go; DO NOT EDIT\n\n") fmt.Printf("// Package traditionalchinese provides Traditional Chinese encodings such as Big5.\n") - fmt.Printf(`package traditionalchinese // import "golang.org/x/text/encoding/traditionalchinese"` + "\n\n") + fmt.Printf(`package traditionalchinese // import "github.com/liquid-dev/text/encoding/traditionalchinese"` + "\n\n") res, err := http.Get("http://encoding.spec.whatwg.org/index-big5.txt") if err != nil { diff --git a/encoding/traditionalchinese/tables.go b/encoding/traditionalchinese/tables.go index d909e38e5..bc8ec2e4e 100644 --- a/encoding/traditionalchinese/tables.go +++ b/encoding/traditionalchinese/tables.go @@ -1,7 +1,7 @@ // generated by go run maketables.go; DO NOT EDIT // Package traditionalchinese provides Traditional Chinese encodings such as Big5. -package traditionalchinese // import "golang.org/x/text/encoding/traditionalchinese" +package traditionalchinese // import "github.com/liquid-dev/text/encoding/traditionalchinese" // decode is the decoding table from Big5 code to Unicode. // It is defined at http://encoding.spec.whatwg.org/index-big5.txt diff --git a/encoding/unicode/override.go b/encoding/unicode/override.go index 35d62fcc9..dc3113a7c 100644 --- a/encoding/unicode/override.go +++ b/encoding/unicode/override.go @@ -5,7 +5,7 @@ package unicode import ( - "golang.org/x/text/transform" + "github.com/liquid-dev/text/transform" ) // BOMOverride returns a new decoder transformer that is identical to fallback, diff --git a/encoding/unicode/unicode.go b/encoding/unicode/unicode.go index 4850ff365..f4586d524 100644 --- a/encoding/unicode/unicode.go +++ b/encoding/unicode/unicode.go @@ -3,19 +3,19 @@ // license that can be found in the LICENSE file. // Package unicode provides Unicode encodings such as UTF-16. -package unicode // import "golang.org/x/text/encoding/unicode" +package unicode // import "github.com/liquid-dev/text/encoding/unicode" import ( "errors" "unicode/utf16" "unicode/utf8" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/internal" - "golang.org/x/text/encoding/internal/identifier" - "golang.org/x/text/internal/utf8internal" - "golang.org/x/text/runes" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/internal" + "github.com/liquid-dev/text/encoding/internal/identifier" + "github.com/liquid-dev/text/internal/utf8internal" + "github.com/liquid-dev/text/runes" + "github.com/liquid-dev/text/transform" ) // TODO: I think the Transformers really should return errors on unmatched diff --git a/encoding/unicode/unicode_test.go b/encoding/unicode/unicode_test.go index 51b4712d8..7b29f8e91 100644 --- a/encoding/unicode/unicode_test.go +++ b/encoding/unicode/unicode_test.go @@ -7,10 +7,10 @@ package unicode import ( "testing" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/charmap" - "golang.org/x/text/encoding/internal/enctest" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/charmap" + "github.com/liquid-dev/text/encoding/internal/enctest" + "github.com/liquid-dev/text/transform" ) func TestBasics(t *testing.T) { diff --git a/encoding/unicode/utf32/utf32.go b/encoding/unicode/utf32/utf32.go index 345eb4fa2..731640c72 100644 --- a/encoding/unicode/utf32/utf32.go +++ b/encoding/unicode/utf32/utf32.go @@ -10,15 +10,15 @@ // (https://www.w3.org/TR/html5/document-metadata.html#charset) // while WHATWG directly prohibits supporting it // (https://html.spec.whatwg.org/multipage/syntax.html#character-encodings). -package utf32 // import "golang.org/x/text/encoding/unicode/utf32" +package utf32 // import "github.com/liquid-dev/text/encoding/unicode/utf32" import ( "errors" "unicode/utf8" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/internal/identifier" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/internal/identifier" + "github.com/liquid-dev/text/transform" ) // All lists a configuration for each IANA-defined UTF-32 variant. diff --git a/encoding/unicode/utf32/utf32_test.go b/encoding/unicode/utf32/utf32_test.go index cd6158e5e..db8f518c0 100644 --- a/encoding/unicode/utf32/utf32_test.go +++ b/encoding/unicode/utf32/utf32_test.go @@ -7,9 +7,9 @@ package utf32 import ( "testing" - "golang.org/x/text/encoding" - "golang.org/x/text/encoding/internal/enctest" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/encoding" + "github.com/liquid-dev/text/encoding/internal/enctest" + "github.com/liquid-dev/text/transform" ) var ( diff --git a/feature/plural/example_test.go b/feature/plural/example_test.go index c75408c0e..c5223008b 100644 --- a/feature/plural/example_test.go +++ b/feature/plural/example_test.go @@ -5,9 +5,9 @@ package plural_test import ( - "golang.org/x/text/feature/plural" - "golang.org/x/text/language" - "golang.org/x/text/message" + "github.com/liquid-dev/text/feature/plural" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message" ) func ExampleSelect() { diff --git a/feature/plural/gen.go b/feature/plural/gen.go index 42f2f8676..4a1e17a9a 100644 --- a/feature/plural/gen.go +++ b/feature/plural/gen.go @@ -63,10 +63,10 @@ import ( "strconv" "strings" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/language" - "golang.org/x/text/internal/language/compact" - "golang.org/x/text/unicode/cldr" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/language" + "github.com/liquid-dev/text/internal/language/compact" + "github.com/liquid-dev/text/unicode/cldr" ) var ( diff --git a/feature/plural/message.go b/feature/plural/message.go index f931f8a6a..8e73b65ba 100644 --- a/feature/plural/message.go +++ b/feature/plural/message.go @@ -10,10 +10,10 @@ import ( "reflect" "strconv" - "golang.org/x/text/internal/catmsg" - "golang.org/x/text/internal/number" - "golang.org/x/text/language" - "golang.org/x/text/message/catalog" + "github.com/liquid-dev/text/internal/catmsg" + "github.com/liquid-dev/text/internal/number" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message/catalog" ) // TODO: consider deleting this interface. Maybe VisibleDigits is always @@ -105,7 +105,7 @@ const ( kindPrecision // verb g, number of significant digits follows ) -var handle = catmsg.Register("golang.org/x/text/feature/plural:plural", execute) +var handle = catmsg.Register("github.com/liquid-dev/text/feature/plural:plural", execute) func (m *message) Compile(e *catmsg.Encoder) error { e.EncodeMessageType(handle) diff --git a/feature/plural/message_test.go b/feature/plural/message_test.go index b5bc47e87..0eeef5d7e 100644 --- a/feature/plural/message_test.go +++ b/feature/plural/message_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "golang.org/x/text/internal/catmsg" - "golang.org/x/text/language" - "golang.org/x/text/message/catalog" + "github.com/liquid-dev/text/internal/catmsg" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message/catalog" ) func TestSelect(t *testing.T) { diff --git a/feature/plural/plural.go b/feature/plural/plural.go index 5b521b144..6cc749745 100644 --- a/feature/plural/plural.go +++ b/feature/plural/plural.go @@ -13,9 +13,9 @@ package plural import ( - "golang.org/x/text/internal/language/compact" - "golang.org/x/text/internal/number" - "golang.org/x/text/language" + "github.com/liquid-dev/text/internal/language/compact" + "github.com/liquid-dev/text/internal/number" + "github.com/liquid-dev/text/language" ) // Rules defines the plural rules for all languages for a certain plural type. diff --git a/feature/plural/plural_test.go b/feature/plural/plural_test.go index feee4f0eb..7e4be72e5 100644 --- a/feature/plural/plural_test.go +++ b/feature/plural/plural_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) func TestGetIntApprox(t *testing.T) { diff --git a/gen.go b/gen.go index 448b9abd5..ad74ada20 100644 --- a/gen.go +++ b/gen.go @@ -24,9 +24,9 @@ import ( "sync" "unicode" - "golang.org/x/text/collate" - "golang.org/x/text/internal/gen" - "golang.org/x/text/language" + "github.com/liquid-dev/text/collatee + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/language" ) var ( @@ -233,7 +233,7 @@ func copyExported(p string) { copyPackage( filepath.Join("internal", "export", path.Base(p)), filepath.Join("..", filepath.FromSlash(p[len("golang.org/x"):])), - "golang.org/x/text/internal/export/"+path.Base(p), + "github.com/liquid-dev/text/internal/export/"+path.Base(p), p) } diff --git a/internal/catmsg/catmsg.go b/internal/catmsg/catmsg.go index c0bf86f09..0ce22abcb 100644 --- a/internal/catmsg/catmsg.go +++ b/internal/catmsg/catmsg.go @@ -68,7 +68,7 @@ import ( "strings" "sync" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) // A Handle refers to a registered message type. @@ -109,7 +109,7 @@ const ( numInternal = 20 ) -const prefix = "golang.org/x/text/internal/catmsg." +const prefix = "github.com/liquid-dev/text/internal/catmsg." var ( // TODO: find a more stable way to link handles to message types. diff --git a/internal/catmsg/catmsg_test.go b/internal/catmsg/catmsg_test.go index b2a7a9e45..3dab99e1f 100644 --- a/internal/catmsg/catmsg_test.go +++ b/internal/catmsg/catmsg_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) type renderer struct { @@ -271,7 +271,7 @@ type empty struct{} func (empty) Compile(e *Encoder) (err error) { return nil } var msgIncomplete = Register( - "golang.org/x/text/internal/catmsg.incomplete", + "github.com/liquid-dev/text/internal/catmsg.incomplete", func(d *Decoder) bool { return false }) type incomplete struct{} @@ -282,7 +282,7 @@ func (incomplete) Compile(e *Encoder) (err error) { } var msgNested = Register( - "golang.org/x/text/internal/catmsg.nested", + "github.com/liquid-dev/text/internal/catmsg.nested", func(d *Decoder) bool { d.Render(d.DecodeString()) d.ExecuteMessage() diff --git a/internal/catmsg/codec.go b/internal/catmsg/codec.go index 49c9fc978..a8656a729 100644 --- a/internal/catmsg/codec.go +++ b/internal/catmsg/codec.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) // A Renderer renders a Message. diff --git a/internal/cldrtree/cldrtree.go b/internal/cldrtree/cldrtree.go index 7530831d6..271d0cd8a 100644 --- a/internal/cldrtree/cldrtree.go +++ b/internal/cldrtree/cldrtree.go @@ -73,9 +73,9 @@ import ( "strings" "unicode/utf8" - "golang.org/x/text/internal/gen" - "golang.org/x/text/language" - "golang.org/x/text/unicode/cldr" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/unicode/cldr" ) // TODO: diff --git a/internal/cldrtree/cldrtree_test.go b/internal/cldrtree/cldrtree_test.go index 06c366a05..c90e81c17 100644 --- a/internal/cldrtree/cldrtree_test.go +++ b/internal/cldrtree/cldrtree_test.go @@ -17,10 +17,10 @@ import ( "strings" "testing" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/language/compact" - "golang.org/x/text/language" - "golang.org/x/text/unicode/cldr" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/language/compact" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/unicode/cldr" ) var genOutput = flag.Bool("gen", false, "generate output files") diff --git a/internal/cldrtree/generate.go b/internal/cldrtree/generate.go index 0f0b5f3be..82e07388c 100644 --- a/internal/cldrtree/generate.go +++ b/internal/cldrtree/generate.go @@ -12,11 +12,11 @@ import ( "strconv" "strings" - "golang.org/x/text/internal/gen" + "github.com/liquid-dev/text/internal/gen" ) func generate(b *Builder, t *Tree, w *gen.CodeWriter) error { - fmt.Fprintln(w, `import "golang.org/x/text/internal/cldrtree"`) + fmt.Fprintln(w, `import "github.com/liquid-dev/text/internal/cldrtree"`) fmt.Fprintln(w) fmt.Fprintf(w, "var tree = &cldrtree.Tree{locales, indices, buckets}\n\n") diff --git a/internal/cldrtree/option.go b/internal/cldrtree/option.go index f91e250b8..8b8daed49 100644 --- a/internal/cldrtree/option.go +++ b/internal/cldrtree/option.go @@ -7,7 +7,7 @@ package cldrtree import ( "reflect" - "golang.org/x/text/unicode/cldr" + "github.com/liquid-dev/text/unicode/cldr" ) // An Option configures an Index. diff --git a/internal/cldrtree/testdata/test1/output.go b/internal/cldrtree/testdata/test1/output.go index 367fc70fb..f36d7dda3 100644 --- a/internal/cldrtree/testdata/test1/output.go +++ b/internal/cldrtree/testdata/test1/output.go @@ -2,7 +2,7 @@ package test -import "golang.org/x/text/internal/cldrtree" +import "github.com/liquid-dev/text/internal/cldrtree" var tree = &cldrtree.Tree{locales, indices, buckets} diff --git a/internal/cldrtree/testdata/test2/output.go b/internal/cldrtree/testdata/test2/output.go index 63d6d9620..033bff438 100644 --- a/internal/cldrtree/testdata/test2/output.go +++ b/internal/cldrtree/testdata/test2/output.go @@ -2,7 +2,7 @@ package test -import "golang.org/x/text/internal/cldrtree" +import "github.com/liquid-dev/text/internal/cldrtree" var tree = &cldrtree.Tree{locales, indices, buckets} diff --git a/internal/cldrtree/tree.go b/internal/cldrtree/tree.go index 932194713..8ba047b36 100644 --- a/internal/cldrtree/tree.go +++ b/internal/cldrtree/tree.go @@ -5,8 +5,8 @@ package cldrtree import ( - "golang.org/x/text/internal/language/compact" - "golang.org/x/text/language" + "github.com/liquid-dev/text/internal/language/compact" + "github.com/liquid-dev/text/language" ) const ( diff --git a/internal/colltab/collate_test.go b/internal/colltab/collate_test.go index 580c85c22..3e7c9e45a 100644 --- a/internal/colltab/collate_test.go +++ b/internal/colltab/collate_test.go @@ -12,9 +12,9 @@ import ( "testing" "unicode" - "golang.org/x/text/collate" - "golang.org/x/text/language" - "golang.org/x/text/unicode/rangetable" + "github.com/liquid-dev/text/collate" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/unicode/rangetable" ) // assigned is used to only test runes that are inside the scope of the Unicode diff --git a/internal/colltab/colltab.go b/internal/colltab/colltab.go index 02f22477e..f30d7473b 100644 --- a/internal/colltab/colltab.go +++ b/internal/colltab/colltab.go @@ -4,12 +4,12 @@ // Package colltab contains functionality related to collation tables. // It is only to be used by the collate and search packages. -package colltab // import "golang.org/x/text/internal/colltab" +package colltab // import "github.com/liquid-dev/text/internal/colltab" import ( "sort" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) // MatchLang finds the index of t in tags, using a matching algorithm used for diff --git a/internal/colltab/colltab_test.go b/internal/colltab/colltab_test.go index 36943f076..91961b6ad 100644 --- a/internal/colltab/colltab_test.go +++ b/internal/colltab/colltab_test.go @@ -3,7 +3,7 @@ package colltab import ( "testing" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) func TestMatchLang(t *testing.T) { diff --git a/internal/colltab/numeric_test.go b/internal/colltab/numeric_test.go index e9406ae3f..d5b8ca31c 100644 --- a/internal/colltab/numeric_test.go +++ b/internal/colltab/numeric_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "golang.org/x/text/internal/testtext" + "github.com/liquid-dev/text/internal/testtext" ) const ( diff --git a/internal/colltab/table.go b/internal/colltab/table.go index e26e36da9..8529c995a 100644 --- a/internal/colltab/table.go +++ b/internal/colltab/table.go @@ -7,7 +7,7 @@ package colltab import ( "unicode/utf8" - "golang.org/x/text/unicode/norm" + "github.com/liquid-dev/text/unicode/norm" ) // Table holds all collation data for a given collation ordering. diff --git a/internal/colltab/weighter.go b/internal/colltab/weighter.go index f1ec45fb5..eba99683e 100644 --- a/internal/colltab/weighter.go +++ b/internal/colltab/weighter.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -package colltab // import "golang.org/x/text/internal/colltab" +package colltab // import "github.com/liquid-dev/text/internal/colltab" // A Weighter can be used as a source for Collator and Searcher. type Weighter interface { diff --git a/internal/export/idna/common_test.go b/internal/export/idna/common_test.go index 0b07c12d7..ac73ca93b 100644 --- a/internal/export/idna/common_test.go +++ b/internal/export/idna/common_test.go @@ -8,7 +8,7 @@ package idna import ( "log" - "golang.org/x/text/internal/ucd" + "github.com/liquid-dev/text/internal/ucd" ) func catFromEntry(p *ucd.Parser) (cat category) { diff --git a/internal/export/idna/conformance_test.go b/internal/export/idna/conformance_test.go index 1cdf43ca9..d1e2e884a 100644 --- a/internal/export/idna/conformance_test.go +++ b/internal/export/idna/conformance_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/internal/ucd" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/internal/ucd" ) func TestConformance(t *testing.T) { diff --git a/internal/export/idna/example_test.go b/internal/export/idna/example_test.go index 6e6b8727c..97c467cfe 100644 --- a/internal/export/idna/example_test.go +++ b/internal/export/idna/example_test.go @@ -7,7 +7,7 @@ package idna_test import ( "fmt" - "golang.org/x/text/internal/export/idna" + "github.com/liquid-dev/text/internal/export/idna" ) func ExampleProfile() { diff --git a/internal/export/idna/gen.go b/internal/export/idna/gen.go index 4ad98046f..a52c79a49 100644 --- a/internal/export/idna/gen.go +++ b/internal/export/idna/gen.go @@ -18,10 +18,10 @@ import ( "unicode" "unicode/utf8" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/triegen" - "golang.org/x/text/internal/ucd" - "golang.org/x/text/unicode/bidi" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/triegen" + "github.com/liquid-dev/text/internal/ucd" + "github.com/liquid-dev/text/unicode/bidi" ) func main() { diff --git a/internal/export/idna/gen10.0.0_test.go b/internal/export/idna/gen10.0.0_test.go index c5dfdde61..437c2beec 100644 --- a/internal/export/idna/gen10.0.0_test.go +++ b/internal/export/idna/gen10.0.0_test.go @@ -10,9 +10,9 @@ import ( "testing" "unicode" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/internal/ucd" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/internal/ucd" ) func TestTables(t *testing.T) { diff --git a/internal/export/idna/gen9.0.0_test.go b/internal/export/idna/gen9.0.0_test.go index 0e66f0b16..7b33a51ad 100644 --- a/internal/export/idna/gen9.0.0_test.go +++ b/internal/export/idna/gen9.0.0_test.go @@ -10,9 +10,9 @@ import ( "testing" "unicode" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/internal/ucd" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/internal/ucd" ) func TestTables(t *testing.T) { diff --git a/internal/export/idna/gen_common.go b/internal/export/idna/gen_common.go index 360a02b8e..9a1581139 100644 --- a/internal/export/idna/gen_common.go +++ b/internal/export/idna/gen_common.go @@ -12,7 +12,7 @@ package main import ( "log" - "golang.org/x/text/internal/ucd" + "github.com/liquid-dev/text/internal/ucd" ) func catFromEntry(p *ucd.Parser) (cat category) { diff --git a/internal/export/idna/idna10.0.0.go b/internal/export/idna/idna10.0.0.go index 1244f9ce9..39d3e491d 100644 --- a/internal/export/idna/idna10.0.0.go +++ b/internal/export/idna/idna10.0.0.go @@ -14,16 +14,16 @@ // UTS #46 is defined in https://www.unicode.org/reports/tr46. // See https://unicode.org/cldr/utility/idna.jsp for a visualization of the // differences between these two standards. -package idna // import "golang.org/x/text/internal/export/idna" +package idna // import "github.com/liquid-dev/text/internal/export/idna" import ( "fmt" "strings" "unicode/utf8" - "golang.org/x/text/secure/bidirule" - "golang.org/x/text/unicode/bidi" - "golang.org/x/text/unicode/norm" + "github.com/liquid-dev/text/secure/bidirule" + "github.com/liquid-dev/text/unicode/bidi" + "github.com/liquid-dev/text/unicode/norm" ) // NOTE: Unlike common practice in Go APIs, the functions will return a diff --git a/internal/export/idna/idna9.0.0.go b/internal/export/idna/idna9.0.0.go index 25f2ac3e8..e365009a7 100644 --- a/internal/export/idna/idna9.0.0.go +++ b/internal/export/idna/idna9.0.0.go @@ -14,15 +14,15 @@ // UTS #46 is defined in https://www.unicode.org/reports/tr46. // See https://unicode.org/cldr/utility/idna.jsp for a visualization of the // differences between these two standards. -package idna // import "golang.org/x/text/internal/export/idna" +package idna // import "github.com/liquid-dev/text/internal/export/idna" import ( "fmt" "strings" "unicode/utf8" - "golang.org/x/text/secure/bidirule" - "golang.org/x/text/unicode/norm" + "github.com/liquid-dev/text/secure/bidirule" + "github.com/liquid-dev/text/unicode/norm" ) // NOTE: Unlike common practice in Go APIs, the functions will return a diff --git a/internal/export/idna/idna_test.go b/internal/export/idna/idna_test.go index 7235452c2..ff829cdd0 100644 --- a/internal/export/idna/idna_test.go +++ b/internal/export/idna/idna_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "golang.org/x/text/internal/testtext" + "github.com/liquid-dev/text/internal/testtext" ) func TestAllocToUnicode(t *testing.T) { diff --git a/internal/export/unicode/gen.go b/internal/export/unicode/gen.go index afdc94de6..07ba08bd9 100644 --- a/internal/export/unicode/gen.go +++ b/internal/export/unicode/gen.go @@ -19,9 +19,9 @@ import ( "strings" "unicode" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/ucd" - "golang.org/x/text/unicode/rangetable" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/ucd" + "github.com/liquid-dev/text/unicode/rangetable" ) func main() { diff --git a/internal/export/unicode/unicode_test.go b/internal/export/unicode/unicode_test.go index ce7ae2e75..799d1b213 100644 --- a/internal/export/unicode/unicode_test.go +++ b/internal/export/unicode/unicode_test.go @@ -8,9 +8,9 @@ import ( "testing" "unicode" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/internal/ucd" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/internal/ucd" ) // TestScripts tests for all runes whether they are included in the correct diff --git a/internal/format/format.go b/internal/format/format.go index ee1c57a3c..c13a36df6 100644 --- a/internal/format/format.go +++ b/internal/format/format.go @@ -7,12 +7,12 @@ // // This package is internal now, but will eventually be exposed after the API // settles. -package format // import "golang.org/x/text/internal/format" +package format // import "github.com/liquid-dev/text/internal/format" import ( "fmt" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) // State represents the printer state passed to custom formatters. It provides diff --git a/internal/gen/gen.go b/internal/gen/gen.go index cc6510fda..738fb96be 100644 --- a/internal/gen/gen.go +++ b/internal/gen/gen.go @@ -16,7 +16,7 @@ // IANA data can also optionally be mirrored by putting it in the iana directory // rooted at the top of the local mirror. Beware, though, that IANA data is not // versioned. So it is up to the developer to use the right version. -package gen // import "golang.org/x/text/internal/gen" +package gen // import "github.com/liquid-dev/text/internal/gen" import ( "bytes" @@ -36,7 +36,7 @@ import ( "sync" "unicode" - "golang.org/x/text/unicode/cldr" + "github.com/liquid-dev/text/unicode/cldr" ) var ( @@ -153,7 +153,7 @@ var ( const permissions = 0755 func localReadmeFile() (string, error) { - p, err := build.Import("golang.org/x/text", "", build.FindOnly) + p, err := build.Import("github.com/liquid-dev/text", "", build.FindOnly) if err != nil { return "", fmt.Errorf("Could not locate package: %v", err) } diff --git a/internal/internal.go b/internal/internal.go index 3cddbbdda..4281bd358 100644 --- a/internal/internal.go +++ b/internal/internal.go @@ -4,12 +4,12 @@ // Package internal contains non-exported functionality that are used by // packages in the text repository. -package internal // import "golang.org/x/text/internal" +package internal // import "github.com/liquid-dev/text/internal" import ( "sort" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) // SortTags sorts tags in place. diff --git a/internal/internal_test.go b/internal/internal_test.go index ce1b9a382..e3f49e89b 100644 --- a/internal/internal_test.go +++ b/internal/internal_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) func TestUnique(t *testing.T) { diff --git a/internal/language/compact/compact.go b/internal/language/compact/compact.go index 1b36935ef..879582cab 100644 --- a/internal/language/compact/compact.go +++ b/internal/language/compact/compact.go @@ -11,13 +11,13 @@ // // It may want to export this functionality at some point, but at this point // this is only available for use within x/text. -package compact // import "golang.org/x/text/internal/language/compact" +package compact // import "github.com/liquid-dev/text/internal/language/compact" import ( "sort" "strings" - "golang.org/x/text/internal/language" + "github.com/liquid-dev/text/internal/language" ) // ID is an integer identifying a single tag. diff --git a/internal/language/compact/gen.go b/internal/language/compact/gen.go index 0c36a052f..75440ca47 100644 --- a/internal/language/compact/gen.go +++ b/internal/language/compact/gen.go @@ -14,8 +14,8 @@ import ( "fmt" "log" - "golang.org/x/text/internal/gen" - "golang.org/x/text/unicode/cldr" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/unicode/cldr" ) var ( @@ -33,7 +33,7 @@ func main() { w := gen.NewCodeWriter() defer w.WriteGoFile("tables.go", "compact") - fmt.Fprintln(w, `import "golang.org/x/text/internal/language"`) + fmt.Fprintln(w, `import "github.com/liquid-dev/text/internal/language"`) b := newBuilder(w) gen.WriteCLDRVersion(w) diff --git a/internal/language/compact/gen_index.go b/internal/language/compact/gen_index.go index 136cefaf0..7c3124445 100644 --- a/internal/language/compact/gen_index.go +++ b/internal/language/compact/gen_index.go @@ -14,7 +14,7 @@ import ( "sort" "strings" - "golang.org/x/text/internal/language" + "github.com/liquid-dev/text/internal/language" ) // Compact indices: diff --git a/internal/language/compact/gen_parents.go b/internal/language/compact/gen_parents.go index 9543d5832..cec05093b 100644 --- a/internal/language/compact/gen_parents.go +++ b/internal/language/compact/gen_parents.go @@ -9,10 +9,10 @@ package main import ( "log" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/language" - "golang.org/x/text/internal/language/compact" - "golang.org/x/text/unicode/cldr" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/language" + "github.com/liquid-dev/text/internal/language/compact" + "github.com/liquid-dev/text/unicode/cldr" ) func main() { diff --git a/internal/language/compact/gen_test.go b/internal/language/compact/gen_test.go index 3b74252b3..01d247383 100644 --- a/internal/language/compact/gen_test.go +++ b/internal/language/compact/gen_test.go @@ -7,7 +7,7 @@ package compact import ( "testing" - "golang.org/x/text/internal/language" + "github.com/liquid-dev/text/internal/language" ) func TestParents(t *testing.T) { diff --git a/internal/language/compact/language.go b/internal/language/compact/language.go index 83816a72a..64035d1f2 100644 --- a/internal/language/compact/language.go +++ b/internal/language/compact/language.go @@ -13,7 +13,7 @@ package compact import ( "strings" - "golang.org/x/text/internal/language" + "github.com/liquid-dev/text/internal/language" ) // Tag represents a BCP 47 language tag. It is used to specify an instance of a diff --git a/internal/language/compact/language_test.go b/internal/language/compact/language_test.go index 57fd13f53..f73e64fde 100644 --- a/internal/language/compact/language_test.go +++ b/internal/language/compact/language_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "golang.org/x/text/internal/language" + "github.com/liquid-dev/text/internal/language" ) func mustParse(s string) Tag { diff --git a/internal/language/compact/parse_test.go b/internal/language/compact/parse_test.go index abe3a58c0..f4649b1c3 100644 --- a/internal/language/compact/parse_test.go +++ b/internal/language/compact/parse_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "golang.org/x/text/internal/language" + "github.com/liquid-dev/text/internal/language" ) var errSyntax = language.ErrSyntax diff --git a/internal/language/compact/tables.go b/internal/language/compact/tables.go index 554ca354b..d2cde9f94 100644 --- a/internal/language/compact/tables.go +++ b/internal/language/compact/tables.go @@ -2,7 +2,7 @@ package compact -import "golang.org/x/text/internal/language" +import "github.com/liquid-dev/text/internal/language" // CLDRVersion is the CLDR version from which the tables in this package are derived. const CLDRVersion = "32" diff --git a/internal/language/gen.go b/internal/language/gen.go index cdcc7febc..595eac03b 100644 --- a/internal/language/gen.go +++ b/internal/language/gen.go @@ -23,9 +23,9 @@ import ( "strconv" "strings" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/tag" - "golang.org/x/text/unicode/cldr" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/tag" + "github.com/liquid-dev/text/unicode/cldr" ) var ( @@ -1501,7 +1501,7 @@ func main() { w := gen.NewCodeWriter() defer w.WriteGoFile("tables.go", "language") - fmt.Fprintln(w, `import "golang.org/x/text/internal/tag"`) + fmt.Fprintln(w, `import "github.com/liquid-dev/text/internal/tag"`) b := newBuilder(w) gen.WriteCLDRVersion(w) diff --git a/internal/language/language.go b/internal/language/language.go index 1e74d1aff..b1d874716 100644 --- a/internal/language/language.go +++ b/internal/language/language.go @@ -4,7 +4,7 @@ //go:generate go run gen.go gen_common.go -output tables.go -package language // import "golang.org/x/text/internal/language" +package language // import "github.com/liquid-dev/text/internal/language" // TODO: Remove above NOTE after: // - verifying that tables are dropped correctly (most notably matcher tables). diff --git a/internal/language/language_test.go b/internal/language/language_test.go index 6c7c10836..c2ee615f6 100644 --- a/internal/language/language_test.go +++ b/internal/language/language_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "golang.org/x/text/internal/testtext" + "github.com/liquid-dev/text/internal/testtext" ) func TestTagSize(t *testing.T) { diff --git a/internal/language/lookup.go b/internal/language/lookup.go index 6294b8152..b0fb7419d 100644 --- a/internal/language/lookup.go +++ b/internal/language/lookup.go @@ -10,7 +10,7 @@ import ( "sort" "strconv" - "golang.org/x/text/internal/tag" + "github.com/liquid-dev/text/internal/tag" ) // findIndex tries to find the given tag in idx and returns a standardized error diff --git a/internal/language/lookup_test.go b/internal/language/lookup_test.go index 5b93acba3..73c7155c3 100644 --- a/internal/language/lookup_test.go +++ b/internal/language/lookup_test.go @@ -7,7 +7,7 @@ package language import ( "testing" - "golang.org/x/text/internal/tag" + "github.com/liquid-dev/text/internal/tag" ) func b(s string) []byte { diff --git a/internal/language/parse.go b/internal/language/parse.go index 2be83e1da..4c7e8252e 100644 --- a/internal/language/parse.go +++ b/internal/language/parse.go @@ -10,7 +10,7 @@ import ( "fmt" "sort" - "golang.org/x/text/internal/tag" + "github.com/liquid-dev/text/internal/tag" ) // isAlpha returns true if the byte is not a digit. diff --git a/internal/language/parse_test.go b/internal/language/parse_test.go index 0cc97d7a5..37ef3b09b 100644 --- a/internal/language/parse_test.go +++ b/internal/language/parse_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "golang.org/x/text/internal/tag" + "github.com/liquid-dev/text/internal/tag" ) type scanTest struct { diff --git a/internal/language/tables.go b/internal/language/tables.go index 239e2d29e..9de01ffb9 100644 --- a/internal/language/tables.go +++ b/internal/language/tables.go @@ -2,7 +2,7 @@ package language -import "golang.org/x/text/internal/tag" +import "github.com/liquid-dev/text/internal/tag" // CLDRVersion is the CLDR version from which the tables in this package are derived. const CLDRVersion = "32" diff --git a/internal/match.go b/internal/match.go index 1cc004a6d..1d6c252f5 100644 --- a/internal/match.go +++ b/internal/match.go @@ -12,7 +12,7 @@ package internal // the cldr package. import ( - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) // TODO: consider if (some of the) matching algorithm needs to be public after diff --git a/internal/match_test.go b/internal/match_test.go index 8a3fe6572..9e1488453 100644 --- a/internal/match_test.go +++ b/internal/match_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) func TestInheritanceMatcher(t *testing.T) { diff --git a/internal/number/common.go b/internal/number/common.go index a6e9c8e0d..0f7df193c 100644 --- a/internal/number/common.go +++ b/internal/number/common.go @@ -5,7 +5,7 @@ package number import ( "unicode/utf8" - "golang.org/x/text/internal/language/compact" + "github.com/liquid-dev/text/internal/language/compact" ) // A system identifies a CLDR numbering system. diff --git a/internal/number/format.go b/internal/number/format.go index cd94c5dc4..97748950c 100644 --- a/internal/number/format.go +++ b/internal/number/format.go @@ -8,7 +8,7 @@ import ( "strconv" "unicode/utf8" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) // TODO: diff --git a/internal/number/format_test.go b/internal/number/format_test.go index 01a089430..c7ebca5de 100644 --- a/internal/number/format_test.go +++ b/internal/number/format_test.go @@ -9,7 +9,7 @@ import ( "log" "testing" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) func TestAppendDecimal(t *testing.T) { diff --git a/internal/number/gen.go b/internal/number/gen.go index c836221bf..97f0cef9b 100644 --- a/internal/number/gen.go +++ b/internal/number/gen.go @@ -14,12 +14,12 @@ import ( "strings" "unicode/utf8" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/language" - "golang.org/x/text/internal/language/compact" - "golang.org/x/text/internal/number" - "golang.org/x/text/internal/stringset" - "golang.org/x/text/unicode/cldr" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/language" + "github.com/liquid-dev/text/internal/language/compact" + "github.com/liquid-dev/text/internal/number" + "github.com/liquid-dev/text/internal/stringset" + "github.com/liquid-dev/text/unicode/cldr" ) var ( @@ -54,7 +54,7 @@ func main() { w := gen.NewCodeWriter() defer w.WriteGoFile(*outputFile, pkg) - fmt.Fprintln(w, `import "golang.org/x/text/internal/stringset"`) + fmt.Fprintln(w, `import "github.com/liquid-dev/text/internal/stringset"`) gen.WriteCLDRVersion(w) diff --git a/internal/number/gen_common.go b/internal/number/gen_common.go index b1b41a73a..999707eff 100644 --- a/internal/number/gen_common.go +++ b/internal/number/gen_common.go @@ -9,7 +9,7 @@ package main import ( "unicode/utf8" - "golang.org/x/text/internal/language/compact" + "github.com/liquid-dev/text/internal/language/compact" ) // A system identifies a CLDR numbering system. diff --git a/internal/number/number.go b/internal/number/number.go index e1d933c3f..7251988b9 100644 --- a/internal/number/number.go +++ b/internal/number/number.go @@ -10,8 +10,8 @@ package number import ( "unicode/utf8" - "golang.org/x/text/internal/language/compact" - "golang.org/x/text/language" + "github.com/liquid-dev/text/internal/language/compact" + "github.com/liquid-dev/text/language" ) // Info holds number formatting configuration data. diff --git a/internal/number/number_test.go b/internal/number/number_test.go index cbc28ab49..4a8ec5898 100644 --- a/internal/number/number_test.go +++ b/internal/number/number_test.go @@ -8,8 +8,8 @@ import ( "fmt" "testing" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/language" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/language" ) func TestInfo(t *testing.T) { diff --git a/internal/number/tables.go b/internal/number/tables.go index 0668a377e..c22660695 100644 --- a/internal/number/tables.go +++ b/internal/number/tables.go @@ -2,7 +2,7 @@ package number -import "golang.org/x/text/internal/stringset" +import "github.com/liquid-dev/text/internal/stringset" // CLDRVersion is the CLDR version from which the tables in this package are derived. const CLDRVersion = "32" diff --git a/internal/number/tables_test.go b/internal/number/tables_test.go index f1e542a72..20666523b 100644 --- a/internal/number/tables_test.go +++ b/internal/number/tables_test.go @@ -10,11 +10,11 @@ import ( "reflect" "testing" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/language" - "golang.org/x/text/internal/language/compact" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/unicode/cldr" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/language" + "github.com/liquid-dev/text/internal/language/compact" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/unicode/cldr" ) var draft = flag.String("draft", diff --git a/internal/tag/tag.go b/internal/tag/tag.go index b5d348891..ce82d8d9f 100644 --- a/internal/tag/tag.go +++ b/internal/tag/tag.go @@ -3,7 +3,7 @@ // license that can be found in the LICENSE file. // Package tag contains functionality handling tags and related data. -package tag // import "golang.org/x/text/internal/tag" +package tag // import "github.com/liquid-dev/text/internal/tag" import "sort" diff --git a/internal/testtext/codesize.go b/internal/testtext/codesize.go index 5fc5eaec7..0c3e050e1 100644 --- a/internal/testtext/codesize.go +++ b/internal/testtext/codesize.go @@ -17,7 +17,7 @@ import ( // CodeSize builds the given code sample and returns the binary size or en error // if an error occurred. The code sample typically will look like this: // package main -// import "golang.org/x/text/somepackage" +// import "github.com/liquid-dev/text/somepackage" // func main() { // somepackage.Func() // reference Func to cause it to be linked in. // } diff --git a/internal/testtext/flag.go b/internal/testtext/flag.go index 45b32b2ad..9bb35adbb 100644 --- a/internal/testtext/flag.go +++ b/internal/testtext/flag.go @@ -8,7 +8,7 @@ import ( "flag" "testing" - "golang.org/x/text/internal/gen" + "github.com/liquid-dev/text/internal/gen" ) var long = flag.Bool("long", false, diff --git a/internal/testtext/text.go b/internal/testtext/text.go index ce40d7e77..28e43ff7e 100644 --- a/internal/testtext/text.go +++ b/internal/testtext/text.go @@ -4,7 +4,7 @@ // Package testtext contains test data that is of common use to the text // repository. -package testtext // import "golang.org/x/text/internal/testtext" +package testtext // import "github.com/liquid-dev/text/internal/testtext" const ( diff --git a/internal/triegen/example_compact_test.go b/internal/triegen/example_compact_test.go index 7cf604ca4..d35a786b3 100644 --- a/internal/triegen/example_compact_test.go +++ b/internal/triegen/example_compact_test.go @@ -9,7 +9,7 @@ import ( "io" "io/ioutil" - "golang.org/x/text/internal/triegen" + "github.com/liquid-dev/text/internal/triegen" ) func ExampleCompacter() { diff --git a/internal/triegen/example_test.go b/internal/triegen/example_test.go index 557a152e7..777ebbafc 100644 --- a/internal/triegen/example_test.go +++ b/internal/triegen/example_test.go @@ -10,7 +10,7 @@ import ( "math/rand" "unicode" - "golang.org/x/text/internal/triegen" + "github.com/liquid-dev/text/internal/triegen" ) const seed = 0x12345 diff --git a/internal/triegen/triegen.go b/internal/triegen/triegen.go index 51d218a30..04f3917df 100644 --- a/internal/triegen/triegen.go +++ b/internal/triegen/triegen.go @@ -55,7 +55,7 @@ // It is recommended that users test the generated trie by checking the returned // value for every rune. Such exhaustive tests are possible as the number of // runes in Unicode is limited. -package triegen // import "golang.org/x/text/internal/triegen" +package triegen // import "github.com/liquid-dev/text/internal/triegen" // TODO: Arguably, the internally optimized data types would not have to be // exposed in the generated API. We could also investigate not generating the diff --git a/internal/ucd/example_test.go b/internal/ucd/example_test.go index 338a50d1c..4f785128d 100644 --- a/internal/ucd/example_test.go +++ b/internal/ucd/example_test.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "golang.org/x/text/internal/ucd" + "github.com/liquid-dev/text/internal/ucd" ) func Example() { diff --git a/internal/ucd/ucd.go b/internal/ucd/ucd.go index 0879bc84c..5f54939df 100644 --- a/internal/ucd/ucd.go +++ b/internal/ucd/ucd.go @@ -7,7 +7,7 @@ // https://www.unicode.org/Public/UCD/latest/ucd/ for example files. // // It currently does not support substitutions of missing fields. -package ucd // import "golang.org/x/text/internal/ucd" +package ucd // import "github.com/liquid-dev/text/internal/ucd" import ( "bufio" diff --git a/language/coverage.go b/language/coverage.go index a24fd1a4d..4c11d5c7f 100644 --- a/language/coverage.go +++ b/language/coverage.go @@ -8,7 +8,7 @@ import ( "fmt" "sort" - "golang.org/x/text/internal/language" + "github.com/liquid-dev/text/internal/language" ) // The Coverage interface is used to define the level of coverage of an diff --git a/language/coverage_test.go b/language/coverage_test.go index bbc092caa..65465ee2c 100644 --- a/language/coverage_test.go +++ b/language/coverage_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "golang.org/x/text/internal/language" + "github.com/liquid-dev/text/internal/language" ) func TestSupported(t *testing.T) { diff --git a/language/display/dict_test.go b/language/display/dict_test.go index 17b138980..21c17a9b9 100644 --- a/language/display/dict_test.go +++ b/language/display/dict_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - "golang.org/x/text/internal/testtext" + "github.com/liquid-dev/text/internal/testtext" ) func TestLinking(t *testing.T) { @@ -30,8 +30,8 @@ func getSize(t *testing.T, main string) int { const body = `package main import ( - "golang.org/x/text/language" - "golang.org/x/text/language/display" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/language/display" ) func main() { %s diff --git a/language/display/display.go b/language/display/display.go index d043da907..a6d69ac9b 100644 --- a/language/display/display.go +++ b/language/display/display.go @@ -12,14 +12,14 @@ // large. The display package is designed so that users can reduce the linked-in // table sizes by cherry picking the languages one wishes to support. There is a // Dictionary defined for a selected set of common languages for this purpose. -package display // import "golang.org/x/text/language/display" +package display // import "github.com/liquid-dev/text/language/display" import ( "fmt" "strings" - "golang.org/x/text/internal/format" - "golang.org/x/text/language" + "github.com/liquid-dev/text/internal/format" + "github.com/liquid-dev/text/language" ) /* @@ -41,7 +41,7 @@ type Formatter struct { x interface{} } -// Format implements "golang.org/x/text/internal/format".Formatter. +// Format implements "github.com/liquid-dev/text/internal/format".Formatter. func (f Formatter) Format(state format.State, verb rune) { // TODO: there are a lot of inefficiencies in this code. Fix it when we // language.Tag has embedded compact tags. diff --git a/language/display/display_test.go b/language/display/display_test.go index f26bace14..6088a1179 100644 --- a/language/display/display_test.go +++ b/language/display/display_test.go @@ -11,9 +11,9 @@ import ( "testing" "unicode" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/language" - "golang.org/x/text/message" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message" ) // TODO: test that tables are properly dropped by the linker for various use diff --git a/language/display/examples_test.go b/language/display/examples_test.go index 15d758434..85738149c 100644 --- a/language/display/examples_test.go +++ b/language/display/examples_test.go @@ -7,9 +7,9 @@ package display_test import ( "fmt" - "golang.org/x/text/language" - "golang.org/x/text/language/display" - "golang.org/x/text/message" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/language/display" + "github.com/liquid-dev/text/message" ) func ExampleFormatter() { diff --git a/language/display/lookup.go b/language/display/lookup.go index e6dc0e016..c92ce63c4 100644 --- a/language/display/lookup.go +++ b/language/display/lookup.go @@ -12,7 +12,7 @@ import ( "sort" "strings" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) type namer interface { diff --git a/language/display/maketables.go b/language/display/maketables.go index b520e8ae6..d0010c698 100644 --- a/language/display/maketables.go +++ b/language/display/maketables.go @@ -17,9 +17,9 @@ import ( "sort" "strings" - "golang.org/x/text/internal/gen" - "golang.org/x/text/language" - "golang.org/x/text/unicode/cldr" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/unicode/cldr" ) var ( diff --git a/language/doc.go b/language/doc.go index 8afecd50e..2e73de4ea 100644 --- a/language/doc.go +++ b/language/doc.go @@ -96,7 +96,7 @@ // // BCP 47 - Tags for Identifying Languages http://tools.ietf.org/html/bcp47 // -package language // import "golang.org/x/text/language" +package language // import "github.com/liquid-dev/text/language" // TODO: explanation on how to match languages for your own locale-specific // service. diff --git a/language/examples_test.go b/language/examples_test.go index ad089a3f4..1c5f57e14 100644 --- a/language/examples_test.go +++ b/language/examples_test.go @@ -8,7 +8,7 @@ import ( "fmt" "net/http" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) func ExampleCanonType() { diff --git a/language/gen.go b/language/gen.go index 3004eb42c..aa70619c4 100644 --- a/language/gen.go +++ b/language/gen.go @@ -18,9 +18,9 @@ import ( "strconv" "strings" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/language" - "golang.org/x/text/unicode/cldr" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/language" + "github.com/liquid-dev/text/unicode/cldr" ) var ( diff --git a/language/httpexample_test.go b/language/httpexample_test.go index 03c0ab9cc..d8571b646 100644 --- a/language/httpexample_test.go +++ b/language/httpexample_test.go @@ -9,7 +9,7 @@ import ( "net/http" "strings" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) // matcher is a language.Matcher configured for all supported languages. diff --git a/language/language.go b/language/language.go index abfa17f66..138e76266 100644 --- a/language/language.go +++ b/language/language.go @@ -12,8 +12,8 @@ package language import ( "strings" - "golang.org/x/text/internal/language" - "golang.org/x/text/internal/language/compact" + "github.com/liquid-dev/text/internal/language" + "github.com/liquid-dev/text/internal/language/compact" ) // Tag represents a BCP 47 language tag. It is used to specify an instance of a diff --git a/language/match.go b/language/match.go index f73492134..99de07976 100644 --- a/language/match.go +++ b/language/match.go @@ -8,7 +8,7 @@ import ( "errors" "strings" - "golang.org/x/text/internal/language" + "github.com/liquid-dev/text/internal/language" ) // A MatchOption configures a Matcher. diff --git a/language/match_test.go b/language/match_test.go index c21b86372..37154093b 100644 --- a/language/match_test.go +++ b/language/match_test.go @@ -14,8 +14,8 @@ import ( "strings" "testing" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/internal/ucd" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/internal/ucd" ) var verbose = flag.Bool("verbose", false, "set to true to print the internal tables of matchers") diff --git a/language/parse.go b/language/parse.go index 11acfd885..d6a4eefb6 100644 --- a/language/parse.go +++ b/language/parse.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "golang.org/x/text/internal/language" + "github.com/liquid-dev/text/internal/language" ) // ValueError is returned by any of the parsing functions when the diff --git a/language/parse_test.go b/language/parse_test.go index 2ff28bfd3..4a4b562bc 100644 --- a/language/parse_test.go +++ b/language/parse_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "golang.org/x/text/internal/language" + "github.com/liquid-dev/text/internal/language" ) // equalTags compares language, script and region subtags only. diff --git a/language/tags.go b/language/tags.go index 42ea79266..777bc0a01 100644 --- a/language/tags.go +++ b/language/tags.go @@ -4,7 +4,7 @@ package language -import "golang.org/x/text/internal/language/compact" +import "github.com/liquid-dev/text/internal/language/compact" // TODO: Various sets of commonly use tags and regions. diff --git a/message/catalog.go b/message/catalog.go index 068271def..5cff496e0 100644 --- a/message/catalog.go +++ b/message/catalog.go @@ -8,8 +8,8 @@ package message // Documentation and method names will reflect this by using the exported name. import ( - "golang.org/x/text/language" - "golang.org/x/text/message/catalog" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message/catalog" ) // MatchLanguage reports the matched tag obtained from language.MatchStrings for diff --git a/message/catalog/catalog.go b/message/catalog/catalog.go index de595b510..4f9053407 100644 --- a/message/catalog/catalog.go +++ b/message/catalog/catalog.go @@ -142,7 +142,7 @@ // // // This package is UNDER CONSTRUCTION and its API may change. -package catalog // import "golang.org/x/text/message/catalog" +package catalog // import "github.com/liquid-dev/text/message/catalog" // TODO: // Some way to freeze a catalog. @@ -157,10 +157,10 @@ import ( "errors" "fmt" - "golang.org/x/text/internal" + "github.com/liquid-dev/text/internal" - "golang.org/x/text/internal/catmsg" - "golang.org/x/text/language" + "github.com/liquid-dev/text/internal/catmsg" + "github.com/liquid-dev/text/language" ) // A Catalog allows lookup of translated messages. diff --git a/message/catalog/catalog_test.go b/message/catalog/catalog_test.go index 3de4c5294..dab21a203 100644 --- a/message/catalog/catalog_test.go +++ b/message/catalog/catalog_test.go @@ -11,8 +11,8 @@ import ( "strings" "testing" - "golang.org/x/text/internal/catmsg" - "golang.org/x/text/language" + "github.com/liquid-dev/text/internal/catmsg" + "github.com/liquid-dev/text/language" ) type entry struct { diff --git a/message/catalog/dict.go b/message/catalog/dict.go index a0eb81810..8c8eb320d 100644 --- a/message/catalog/dict.go +++ b/message/catalog/dict.go @@ -7,9 +7,9 @@ package catalog import ( "sync" - "golang.org/x/text/internal" - "golang.org/x/text/internal/catmsg" - "golang.org/x/text/language" + "github.com/liquid-dev/text/internal" + "github.com/liquid-dev/text/internal/catmsg" + "github.com/liquid-dev/text/language" ) // TODO: diff --git a/message/catalog/go19.go b/message/catalog/go19.go index 147fc7cf5..b46f114d3 100644 --- a/message/catalog/go19.go +++ b/message/catalog/go19.go @@ -6,7 +6,7 @@ package catalog -import "golang.org/x/text/internal/catmsg" +import "github.com/liquid-dev/text/internal/catmsg" // A Message holds a collection of translations for the same phrase that may // vary based on the values of substitution arguments. diff --git a/message/catalog/gopre19.go b/message/catalog/gopre19.go index a9753b905..a4e2cad3c 100644 --- a/message/catalog/gopre19.go +++ b/message/catalog/gopre19.go @@ -6,7 +6,7 @@ package catalog -import "golang.org/x/text/internal/catmsg" +import "github.com/liquid-dev/text/internal/catmsg" // A Message holds a collection of translations for the same phrase that may // vary based on the values of substitution arguments. diff --git a/message/catalog_test.go b/message/catalog_test.go index d1fdfde5e..9bfb504d3 100644 --- a/message/catalog_test.go +++ b/message/catalog_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "golang.org/x/text/language" - "golang.org/x/text/message/catalog" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message/catalog" ) func TestMatchLanguage(t *testing.T) { diff --git a/message/examples_test.go b/message/examples_test.go index 8c3dff557..2cc6c49cc 100644 --- a/message/examples_test.go +++ b/message/examples_test.go @@ -8,8 +8,8 @@ import ( "fmt" "net/http" - "golang.org/x/text/language" - "golang.org/x/text/message" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message" ) func Example_http() { diff --git a/message/fmt_test.go b/message/fmt_test.go index 2d6872bf8..f134b5bd0 100644 --- a/message/fmt_test.go +++ b/message/fmt_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) type ( diff --git a/message/format.go b/message/format.go index a47d17dd4..6a7dc8349 100644 --- a/message/format.go +++ b/message/format.go @@ -9,7 +9,7 @@ import ( "strconv" "unicode/utf8" - "golang.org/x/text/internal/format" + "github.com/liquid-dev/text/internal/format" ) const ( diff --git a/message/message.go b/message/message.go index 48d76630c..00c64adfe 100644 --- a/message/message.go +++ b/message/message.go @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -package message // import "golang.org/x/text/message" +package message // import "github.com/liquid-dev/text/message" import ( "io" "os" // Include features to facilitate generated catalogs. - _ "golang.org/x/text/feature/plural" + _ "github.com/liquid-dev/text/feature/plural" - "golang.org/x/text/internal/number" - "golang.org/x/text/language" - "golang.org/x/text/message/catalog" + "github.com/liquid-dev/text/internal/number" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message/catalog" ) // A Printer implements language-specific formatted I/O analogous to the fmt diff --git a/message/message_test.go b/message/message_test.go index e84bd9787..8b2c1cd4a 100644 --- a/message/message_test.go +++ b/message/message_test.go @@ -10,10 +10,10 @@ import ( "io" "testing" - "golang.org/x/text/internal" - "golang.org/x/text/internal/format" - "golang.org/x/text/language" - "golang.org/x/text/message/catalog" + "github.com/liquid-dev/text/internal" + "github.com/liquid-dev/text/internal/format" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message/catalog" ) type formatFunc func(s fmt.State, v rune) diff --git a/message/pipeline/extract.go b/message/pipeline/extract.go index 39b3dd5c4..f3608627e 100644 --- a/message/pipeline/extract.go +++ b/message/pipeline/extract.go @@ -18,7 +18,7 @@ import ( "unicode" "unicode/utf8" - fmtparser "golang.org/x/text/internal/format" + fmtparser "github.com/liquid-dev/text/internal/format" "golang.org/x/tools/go/callgraph" "golang.org/x/tools/go/callgraph/cha" "golang.org/x/tools/go/loader" @@ -100,7 +100,7 @@ func (x *extracter) globalData(pos token.Pos) *constData { } func (x *extracter) seedEndpoints() error { - pkgInfo := x.iprog.Package("golang.org/x/text/message") + pkgInfo := x.iprog.Package("github.com/liquid-dev/text/message") if pkgInfo == nil { return errors.New("pipeline: golang.org/x/text/message is not imported") } diff --git a/message/pipeline/generate.go b/message/pipeline/generate.go index 5d329b2f4..20323d8a3 100644 --- a/message/pipeline/generate.go +++ b/message/pipeline/generate.go @@ -14,12 +14,12 @@ import ( "strings" "text/template" - "golang.org/x/text/collate" - "golang.org/x/text/feature/plural" - "golang.org/x/text/internal" - "golang.org/x/text/internal/catmsg" - "golang.org/x/text/internal/gen" - "golang.org/x/text/language" + "github.com/liquid-dev/text/collate" + "github.com/liquid-dev/text/feature/plural" + "github.com/liquid-dev/text/internal" + "github.com/liquid-dev/text/internal/catmsg" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/language" "golang.org/x/tools/go/loader" ) @@ -279,9 +279,9 @@ var cmpNumeric = collate.New(language.Und, collate.Numeric).CompareString var lookup = template.Must(template.New("gen").Parse(` import ( - "golang.org/x/text/language" - "golang.org/x/text/message" - "golang.org/x/text/message/catalog" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message" + "github.com/liquid-dev/text/message/catalog" ) type dictionary struct { diff --git a/message/pipeline/message.go b/message/pipeline/message.go index c83a8fd87..c91c5a564 100644 --- a/message/pipeline/message.go +++ b/message/pipeline/message.go @@ -9,7 +9,7 @@ import ( "errors" "strings" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) // TODO: these definitions should be moved to a package so that the can be used diff --git a/message/pipeline/pipeline.go b/message/pipeline/pipeline.go index cafd6f29b..2b58b64d2 100644 --- a/message/pipeline/pipeline.go +++ b/message/pipeline/pipeline.go @@ -22,9 +22,9 @@ import ( "text/template" "unicode" - "golang.org/x/text/internal" - "golang.org/x/text/language" - "golang.org/x/text/runes" + "github.com/liquid-dev/text/internal" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/runes" "golang.org/x/tools/go/loader" ) diff --git a/message/pipeline/pipeline_test.go b/message/pipeline/pipeline_test.go index 455045554..39375304c 100644 --- a/message/pipeline/pipeline_test.go +++ b/message/pipeline/pipeline_test.go @@ -18,7 +18,7 @@ import ( "strings" "testing" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) var genFiles = flag.Bool("gen", false, "generate output files instead of comparing") diff --git a/message/pipeline/rewrite.go b/message/pipeline/rewrite.go index cf1511f56..2ec14f76e 100644 --- a/message/pipeline/rewrite.go +++ b/message/pipeline/rewrite.go @@ -18,7 +18,7 @@ import ( "golang.org/x/tools/go/loader" ) -const printerType = "golang.org/x/text/message.Printer" +const printerType = "github.com/liquid-dev/text/message.Printer" // Rewrite rewrites the Go files in a single package to use the localization // machinery and rewrites strings to adopt best practices when possible. @@ -139,7 +139,7 @@ func (r *rewriter) Visit(n ast.Node) ast.Visitor { // TODO: remove cheap hack and check if the type either // implements some interface or is specifically of type - // "golang.org/x/text/message".Printer. + // "github.com/liquid-dev/text/message".Printer. m, ok := rewriteFuncs[source] if !ok { return r diff --git a/message/pipeline/testdata/ssa/catalog_gen.go b/message/pipeline/testdata/ssa/catalog_gen.go index 2e14d5afc..35647b3cc 100644 --- a/message/pipeline/testdata/ssa/catalog_gen.go +++ b/message/pipeline/testdata/ssa/catalog_gen.go @@ -3,9 +3,9 @@ package main import ( - "golang.org/x/text/language" - "golang.org/x/text/message" - "golang.org/x/text/message/catalog" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message" + "github.com/liquid-dev/text/message/catalog" ) type dictionary struct { diff --git a/message/pipeline/testdata/ssa/ssa.go b/message/pipeline/testdata/ssa/ssa.go index 159124289..d6fcdaddb 100644 --- a/message/pipeline/testdata/ssa/ssa.go +++ b/message/pipeline/testdata/ssa/ssa.go @@ -1,8 +1,8 @@ package main import ( - "golang.org/x/text/language" - "golang.org/x/text/message" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message" ) // In this test, lowercap strings are ones that need to be picked up for diff --git a/message/pipeline/testdata/test1/catalog_gen.go b/message/pipeline/testdata/test1/catalog_gen.go index 7d93f4868..65a7fb2a6 100644 --- a/message/pipeline/testdata/test1/catalog_gen.go +++ b/message/pipeline/testdata/test1/catalog_gen.go @@ -3,9 +3,9 @@ package main import ( - "golang.org/x/text/language" - "golang.org/x/text/message" - "golang.org/x/text/message/catalog" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message" + "github.com/liquid-dev/text/message/catalog" ) type dictionary struct { diff --git a/message/pipeline/testdata/test1/catalog_test.go b/message/pipeline/testdata/test1/catalog_test.go index eeb7c25f4..297947970 100644 --- a/message/pipeline/testdata/test1/catalog_test.go +++ b/message/pipeline/testdata/test1/catalog_test.go @@ -8,7 +8,7 @@ import ( "path" "testing" - "golang.org/x/text/message" + "github.com/liquid-dev/text/message" ) func TestCatalog(t *testing.T) { diff --git a/message/pipeline/testdata/test1/test1.go b/message/pipeline/testdata/test1/test1.go index 88051f932..4a77608b8 100644 --- a/message/pipeline/testdata/test1/test1.go +++ b/message/pipeline/testdata/test1/test1.go @@ -4,7 +4,7 @@ package main -import "golang.org/x/text/message" +import "github.com/liquid-dev/text/message" func main() { p := message.NewPrinter(message.MatchLanguage("en")) diff --git a/message/print.go b/message/print.go index da304cc0e..d096fcd47 100644 --- a/message/print.go +++ b/message/print.go @@ -12,10 +12,10 @@ import ( "sync" "unicode/utf8" - "golang.org/x/text/internal/format" - "golang.org/x/text/internal/number" - "golang.org/x/text/language" - "golang.org/x/text/message/catalog" + "github.com/liquid-dev/text/internal/format" + "github.com/liquid-dev/text/internal/number" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message/catalog" ) // Strings for use with buffer.WriteString. @@ -64,7 +64,7 @@ func (p *printer) free() { } // printer is used to store a printer's state. -// It implements "golang.org/x/text/internal/format".State. +// It implements "github.com/liquid-dev/text/internal/format".State. type printer struct { Printer @@ -88,7 +88,7 @@ type printer struct { erroring bool } -// Language implements "golang.org/x/text/internal/format".State. +// Language implements "github.com/liquid-dev/text/internal/format".State. func (p *printer) Language() language.Tag { return p.tag } func (p *printer) Width() (wid int, ok bool) { return p.fmt.Width, p.fmt.WidthPresent } diff --git a/number/examples_test.go b/number/examples_test.go index fb9bcc960..89ddf1bee 100644 --- a/number/examples_test.go +++ b/number/examples_test.go @@ -5,9 +5,9 @@ package number_test import ( - "golang.org/x/text/language" - "golang.org/x/text/message" - "golang.org/x/text/number" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message" + "github.com/liquid-dev/text/number" ) func ExampleMaxIntegerDigits() { diff --git a/number/format.go b/number/format.go index 1c3d41be0..d5a4cf0fd 100644 --- a/number/format.go +++ b/number/format.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "golang.org/x/text/feature/plural" - "golang.org/x/text/internal/format" - "golang.org/x/text/internal/number" - "golang.org/x/text/language" + "github.com/liquid-dev/text/feature/plural" + "github.com/liquid-dev/text/internal/format" + "github.com/liquid-dev/text/internal/number" + "github.com/liquid-dev/text/language" ) // A FormatFunc formates a number. diff --git a/number/format_test.go b/number/format_test.go index 0205f8d0d..79ea97d02 100644 --- a/number/format_test.go +++ b/number/format_test.go @@ -8,9 +8,9 @@ import ( "fmt" "testing" - "golang.org/x/text/feature/plural" - "golang.org/x/text/language" - "golang.org/x/text/message" + "github.com/liquid-dev/text/feature/plural" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message" ) func TestWrongVerb(t *testing.T) { diff --git a/number/number.go b/number/number.go index f5ca93b15..ffffc1f21 100644 --- a/number/number.go +++ b/number/number.go @@ -13,7 +13,7 @@ package number // import ( - "golang.org/x/text/internal/number" + "github.com/liquid-dev/text/internal/number" ) const ( diff --git a/number/number_test.go b/number/number_test.go index 3dcac3649..0da36d48c 100644 --- a/number/number_test.go +++ b/number/number_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "golang.org/x/text/language" - "golang.org/x/text/message" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message" ) func TestFormatter(t *testing.T) { diff --git a/number/option.go b/number/option.go index de96f8eaa..53e6b4c7d 100644 --- a/number/option.go +++ b/number/option.go @@ -7,8 +7,8 @@ package number import ( "fmt" - "golang.org/x/text/internal/number" - "golang.org/x/text/language" + "github.com/liquid-dev/text/internal/number" + "github.com/liquid-dev/text/language" ) // An Option configures a Formatter. diff --git a/runes/cond.go b/runes/cond.go index df7aa02db..451ba58e6 100644 --- a/runes/cond.go +++ b/runes/cond.go @@ -7,7 +7,7 @@ package runes import ( "unicode/utf8" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/transform" ) // Note: below we pass invalid UTF-8 to the tIn and tNotIn transformers as is. diff --git a/runes/cond_test.go b/runes/cond_test.go index 44cd36d0b..06393cd3e 100644 --- a/runes/cond_test.go +++ b/runes/cond_test.go @@ -9,9 +9,9 @@ import ( "testing" "unicode" - "golang.org/x/text/cases" - "golang.org/x/text/language" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/cases" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/transform" ) var ( diff --git a/runes/example_test.go b/runes/example_test.go index a60bfd9d2..0873d73ed 100644 --- a/runes/example_test.go +++ b/runes/example_test.go @@ -8,10 +8,10 @@ import ( "fmt" "unicode" - "golang.org/x/text/runes" - "golang.org/x/text/transform" - "golang.org/x/text/unicode/norm" - "golang.org/x/text/width" + "github.com/liquid-dev/text/runes" + "github.com/liquid-dev/text/transform" + "github.com/liquid-dev/text/unicode/norm" + "github.com/liquid-dev/text/width" ) func ExampleRemove() { diff --git a/runes/runes.go b/runes/runes.go index 71933696f..2d6c2916d 100644 --- a/runes/runes.go +++ b/runes/runes.go @@ -3,13 +3,13 @@ // license that can be found in the LICENSE file. // Package runes provide transforms for UTF-8 encoded text. -package runes // import "golang.org/x/text/runes" +package runes // import "github.com/liquid-dev/text/runes" import ( "unicode" "unicode/utf8" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/transform" ) // A Set is a collection of runes. diff --git a/runes/runes_test.go b/runes/runes_test.go index 23c5bc952..0825c264e 100644 --- a/runes/runes_test.go +++ b/runes/runes_test.go @@ -9,8 +9,8 @@ import ( "testing" "unicode/utf8" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/transform" ) type transformTest struct { diff --git a/search/index.go b/search/index.go index 35de8f5fb..433fbf361 100644 --- a/search/index.go +++ b/search/index.go @@ -7,7 +7,7 @@ package search -import "golang.org/x/text/internal/colltab" +import "github.com/liquid-dev/text/internal/colltab" const blockSize = 64 diff --git a/search/pattern.go b/search/pattern.go index 2497cfd2f..99512d89d 100644 --- a/search/pattern.go +++ b/search/pattern.go @@ -5,7 +5,7 @@ package search import ( - "golang.org/x/text/internal/colltab" + "github.com/liquid-dev/text/internal/colltab" ) // TODO: handle variable primary weights? diff --git a/search/pattern_test.go b/search/pattern_test.go index 931fa6562..dd9467599 100644 --- a/search/pattern_test.go +++ b/search/pattern_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "golang.org/x/text/language" + "github.com/liquid-dev/text/language" ) func TestCompile(t *testing.T) { diff --git a/search/search.go b/search/search.go index 894b6c6c2..45db218c3 100644 --- a/search/search.go +++ b/search/search.go @@ -13,13 +13,13 @@ // // Text passed to any of the calls in this message does not need to be // normalized. -package search // import "golang.org/x/text/search" +package search // import "github.com/liquid-dev/text/search" import ( "strings" - "golang.org/x/text/internal/colltab" - "golang.org/x/text/language" + "github.com/liquid-dev/text/internal/colltab" + "github.com/liquid-dev/text/language" ) // An Option configures a Matcher. diff --git a/secure/bidirule/bench_test.go b/secure/bidirule/bench_test.go index 2db922bfd..e9611acc0 100644 --- a/secure/bidirule/bench_test.go +++ b/secure/bidirule/bench_test.go @@ -7,7 +7,7 @@ package bidirule import ( "testing" - "golang.org/x/text/internal/testtext" + "github.com/liquid-dev/text/internal/testtext" ) var benchData = []struct{ name, data string }{ diff --git a/secure/bidirule/bidirule.go b/secure/bidirule/bidirule.go index e2b70f76c..5e92d8883 100644 --- a/secure/bidirule/bidirule.go +++ b/secure/bidirule/bidirule.go @@ -12,8 +12,8 @@ import ( "errors" "unicode/utf8" - "golang.org/x/text/transform" - "golang.org/x/text/unicode/bidi" + "github.com/liquid-dev/text/transform" + "github.com/liquid-dev/text/unicode/bidi" ) // This file contains an implementation of RFC 5893: Right-to-Left Scripts for diff --git a/secure/bidirule/bidirule10.0.0_test.go b/secure/bidirule/bidirule10.0.0_test.go index 06ec5f5df..82cee29b1 100644 --- a/secure/bidirule/bidirule10.0.0_test.go +++ b/secure/bidirule/bidirule10.0.0_test.go @@ -7,8 +7,8 @@ package bidirule import ( - "golang.org/x/text/transform" - "golang.org/x/text/unicode/bidi" + "github.com/liquid-dev/text/transform" + "github.com/liquid-dev/text/unicode/bidi" ) var testCases = [][]ruleTest{ diff --git a/secure/bidirule/bidirule9.0.0_test.go b/secure/bidirule/bidirule9.0.0_test.go index 008874ed3..ac84f55c0 100644 --- a/secure/bidirule/bidirule9.0.0_test.go +++ b/secure/bidirule/bidirule9.0.0_test.go @@ -7,8 +7,8 @@ package bidirule import ( - "golang.org/x/text/transform" - "golang.org/x/text/unicode/bidi" + "github.com/liquid-dev/text/transform" + "github.com/liquid-dev/text/unicode/bidi" ) var testCases = [][]ruleTest{ diff --git a/secure/bidirule/bidirule_test.go b/secure/bidirule/bidirule_test.go index e8fde3383..31027f68a 100644 --- a/secure/bidirule/bidirule_test.go +++ b/secure/bidirule/bidirule_test.go @@ -8,8 +8,8 @@ import ( "fmt" "testing" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/unicode/bidi" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/unicode/bidi" ) const ( diff --git a/secure/doc.go b/secure/doc.go index e531c3543..d186b5e29 100644 --- a/secure/doc.go +++ b/secure/doc.go @@ -3,4 +3,4 @@ // license that can be found in the LICENSE file. // secure is a repository of text security related packages. -package secure // import "golang.org/x/text/secure" +package secure // import "github.com/liquid-dev/text/secure" diff --git a/secure/precis/benchmark_test.go b/secure/precis/benchmark_test.go index 6337d0063..e7db0e56b 100644 --- a/secure/precis/benchmark_test.go +++ b/secure/precis/benchmark_test.go @@ -9,7 +9,7 @@ package precis import ( "testing" - "golang.org/x/text/internal/testtext" + "github.com/liquid-dev/text/internal/testtext" ) var benchData = []struct{ name, str string }{ diff --git a/secure/precis/class_test.go b/secure/precis/class_test.go index fbaf6457f..0718d4fed 100644 --- a/secure/precis/class_test.go +++ b/secure/precis/class_test.go @@ -7,7 +7,7 @@ package precis import ( "testing" - "golang.org/x/text/runes" + "github.com/liquid-dev/text/runes" ) // Compile-time regression test to ensure that Class is a Set diff --git a/secure/precis/doc.go b/secure/precis/doc.go index 939ff222d..fae5fe6e6 100644 --- a/secure/precis/doc.go +++ b/secure/precis/doc.go @@ -9,6 +9,6 @@ // // BE ADVISED: This package is under construction and the API may change in // backwards incompatible ways and without notice. -package precis // import "golang.org/x/text/secure/precis" +package precis // import "github.com/liquid-dev/text/secure/precis" //go:generate go run gen.go gen_trieval.go diff --git a/secure/precis/enforce10.0.0_test.go b/secure/precis/enforce10.0.0_test.go index 34da1503b..72d5041c5 100644 --- a/secure/precis/enforce10.0.0_test.go +++ b/secure/precis/enforce10.0.0_test.go @@ -9,8 +9,8 @@ package precis import ( "strings" - "golang.org/x/text/runes" - "golang.org/x/text/secure/bidirule" + "github.com/liquid-dev/text/runes" + "github.com/liquid-dev/text/secure/bidirule" ) var enforceTestCases = []struct { diff --git a/secure/precis/enforce9.0.0_test.go b/secure/precis/enforce9.0.0_test.go index 209745551..993a09767 100644 --- a/secure/precis/enforce9.0.0_test.go +++ b/secure/precis/enforce9.0.0_test.go @@ -9,8 +9,8 @@ package precis import ( "strings" - "golang.org/x/text/runes" - "golang.org/x/text/secure/bidirule" + "github.com/liquid-dev/text/runes" + "github.com/liquid-dev/text/secure/bidirule" ) var enforceTestCases = []struct { diff --git a/secure/precis/enforce_test.go b/secure/precis/enforce_test.go index ac2aad2c6..ea2424185 100644 --- a/secure/precis/enforce_test.go +++ b/secure/precis/enforce_test.go @@ -10,8 +10,8 @@ import ( "reflect" "testing" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/transform" ) type testCase struct { diff --git a/secure/precis/gen.go b/secure/precis/gen.go index 946acbaa1..302c733e0 100644 --- a/secure/precis/gen.go +++ b/secure/precis/gen.go @@ -15,11 +15,11 @@ import ( "unicode" "unicode/utf8" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/triegen" - "golang.org/x/text/internal/ucd" - "golang.org/x/text/unicode/norm" - "golang.org/x/text/unicode/rangetable" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/triegen" + "github.com/liquid-dev/text/internal/ucd" + "github.com/liquid-dev/text/unicode/norm" + "github.com/liquid-dev/text/unicode/rangetable" ) var outputFile = flag.String("output", "tables.go", "output file for generated tables; default tables.go") diff --git a/secure/precis/nickname.go b/secure/precis/nickname.go index 11e0ccbb1..f41ff4049 100644 --- a/secure/precis/nickname.go +++ b/secure/precis/nickname.go @@ -8,7 +8,7 @@ import ( "unicode" "unicode/utf8" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/transform" ) type nickAdditionalMapping struct { diff --git a/secure/precis/options.go b/secure/precis/options.go index 26143db75..982bb7e8d 100644 --- a/secure/precis/options.go +++ b/secure/precis/options.go @@ -5,11 +5,11 @@ package precis import ( - "golang.org/x/text/cases" - "golang.org/x/text/language" - "golang.org/x/text/runes" - "golang.org/x/text/transform" - "golang.org/x/text/unicode/norm" + "github.com/liquid-dev/text/cases" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/runes" + "github.com/liquid-dev/text/transform" + "github.com/liquid-dev/text/unicode/norm" ) // An Option is used to define the behavior and rules of a Profile. diff --git a/secure/precis/profile.go b/secure/precis/profile.go index 35bd6f0a5..df594ad60 100644 --- a/secure/precis/profile.go +++ b/secure/precis/profile.go @@ -9,12 +9,12 @@ import ( "errors" "unicode/utf8" - "golang.org/x/text/cases" - "golang.org/x/text/language" - "golang.org/x/text/runes" - "golang.org/x/text/secure/bidirule" - "golang.org/x/text/transform" - "golang.org/x/text/width" + "github.com/liquid-dev/text/cases" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/runes" + "github.com/liquid-dev/text/secure/bidirule" + "github.com/liquid-dev/text/transform" + "github.com/liquid-dev/text/width" ) var ( diff --git a/secure/precis/profile_test.go b/secure/precis/profile_test.go index 4edb28a76..9c266d192 100644 --- a/secure/precis/profile_test.go +++ b/secure/precis/profile_test.go @@ -10,8 +10,8 @@ import ( "testing" "unicode" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/transform" ) // copyOrbit is a Transformer for the sole purpose of testing the apply method, diff --git a/secure/precis/profiles.go b/secure/precis/profiles.go index 061936d98..9c190df09 100644 --- a/secure/precis/profiles.go +++ b/secure/precis/profiles.go @@ -7,9 +7,9 @@ package precis import ( "unicode" - "golang.org/x/text/runes" - "golang.org/x/text/transform" - "golang.org/x/text/unicode/norm" + "github.com/liquid-dev/text/runes" + "github.com/liquid-dev/text/transform" + "github.com/liquid-dev/text/unicode/norm" ) var ( diff --git a/secure/precis/tables_test.go b/secure/precis/tables_test.go index 67f5b40c6..c44685a78 100644 --- a/secure/precis/tables_test.go +++ b/secure/precis/tables_test.go @@ -9,8 +9,8 @@ import ( "unicode" "unicode/utf8" - "golang.org/x/text/runes" - "golang.org/x/text/unicode/rangetable" + "github.com/liquid-dev/text/runes" + "github.com/liquid-dev/text/unicode/rangetable" ) type tableTest struct { diff --git a/secure/precis/transformer.go b/secure/precis/transformer.go index 97ce5e757..abf4df7dd 100644 --- a/secure/precis/transformer.go +++ b/secure/precis/transformer.go @@ -4,7 +4,7 @@ package precis -import "golang.org/x/text/transform" +import "github.com/liquid-dev/text/transform" // Transformer implements the transform.Transformer interface. type Transformer struct { diff --git a/transform/examples_test.go b/transform/examples_test.go index f2e284dba..a7b8835e1 100644 --- a/transform/examples_test.go +++ b/transform/examples_test.go @@ -8,8 +8,8 @@ import ( "fmt" "unicode" - "golang.org/x/text/transform" - "golang.org/x/text/unicode/norm" + "github.com/liquid-dev/text/transform" + "github.com/liquid-dev/text/unicode/norm" ) func ExampleRemoveFunc() { diff --git a/transform/transform.go b/transform/transform.go index 520b9ada0..d3e6b018b 100644 --- a/transform/transform.go +++ b/transform/transform.go @@ -6,7 +6,7 @@ // bytes passing through as well as various transformations. Example // transformations provided by other packages include normalization and // conversion between character sets. -package transform // import "golang.org/x/text/transform" +package transform // import "github.com/liquid-dev/text/transform" import ( "bytes" diff --git a/transform/transform_test.go b/transform/transform_test.go index 771633d1d..f021c9c59 100644 --- a/transform/transform_test.go +++ b/transform/transform_test.go @@ -15,7 +15,7 @@ import ( "time" "unicode/utf8" - "golang.org/x/text/internal/testtext" + "github.com/liquid-dev/text/internal/testtext" ) type lowerCaseASCII struct{ NopResetter } diff --git a/unicode/bidi/bidi.go b/unicode/bidi/bidi.go index e8edc54cc..8102d7385 100644 --- a/unicode/bidi/bidi.go +++ b/unicode/bidi/bidi.go @@ -10,7 +10,7 @@ // // NOTE: UNDER CONSTRUCTION. This API may change in backwards incompatible ways // and without notice. -package bidi // import "golang.org/x/text/unicode/bidi" +package bidi // import "github.com/liquid-dev/text/unicode/bidi" // TODO: // The following functionality would not be hard to implement, but hinges on diff --git a/unicode/bidi/core_test.go b/unicode/bidi/core_test.go index b653399c4..94c20f00f 100644 --- a/unicode/bidi/core_test.go +++ b/unicode/bidi/core_test.go @@ -12,10 +12,10 @@ import ( "strings" "testing" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/internal/ucd" - "golang.org/x/text/unicode/norm" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/internal/ucd" + "github.com/liquid-dev/text/unicode/norm" ) var testLevels = flag.Bool("levels", false, "enable testing of levels") diff --git a/unicode/bidi/gen.go b/unicode/bidi/gen.go index 987fc169c..3ecce7163 100644 --- a/unicode/bidi/gen.go +++ b/unicode/bidi/gen.go @@ -10,9 +10,9 @@ import ( "flag" "log" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/triegen" - "golang.org/x/text/internal/ucd" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/triegen" + "github.com/liquid-dev/text/internal/ucd" ) var outputFile = flag.String("out", "tables.go", "output file") diff --git a/unicode/bidi/gen_ranges.go b/unicode/bidi/gen_ranges.go index 02c3b505d..b8cfdc300 100644 --- a/unicode/bidi/gen_ranges.go +++ b/unicode/bidi/gen_ranges.go @@ -9,9 +9,9 @@ package main import ( "unicode" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/ucd" - "golang.org/x/text/unicode/rangetable" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/ucd" + "github.com/liquid-dev/text/unicode/rangetable" ) // These tables are hand-extracted from: diff --git a/unicode/bidi/ranges_test.go b/unicode/bidi/ranges_test.go index 36709402a..06747e7de 100644 --- a/unicode/bidi/ranges_test.go +++ b/unicode/bidi/ranges_test.go @@ -5,9 +5,9 @@ package bidi import ( "unicode" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/ucd" - "golang.org/x/text/unicode/rangetable" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/ucd" + "github.com/liquid-dev/text/unicode/rangetable" ) // These tables are hand-extracted from: diff --git a/unicode/bidi/tables_test.go b/unicode/bidi/tables_test.go index 356a4a58d..d7ea7fca7 100644 --- a/unicode/bidi/tables_test.go +++ b/unicode/bidi/tables_test.go @@ -7,9 +7,9 @@ package bidi import ( "testing" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/internal/ucd" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/internal/ucd" ) var labels = []string{ diff --git a/unicode/cldr/cldr.go b/unicode/cldr/cldr.go index f39b2e3ad..204e00aa8 100644 --- a/unicode/cldr/cldr.go +++ b/unicode/cldr/cldr.go @@ -15,7 +15,7 @@ // old code should keep compiling for newer versions, but data may have moved or // changed. CLDR version 22 is the first version supported by this package. // Older versions may not work. -package cldr // import "golang.org/x/text/unicode/cldr" +package cldr // import "github.com/liquid-dev/text/unicode/cldr" import ( "fmt" diff --git a/unicode/cldr/examples_test.go b/unicode/cldr/examples_test.go index 85d79d1ee..2b2e26193 100644 --- a/unicode/cldr/examples_test.go +++ b/unicode/cldr/examples_test.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "golang.org/x/text/internal/gen" - "golang.org/x/text/unicode/cldr" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/unicode/cldr" ) func ExampleDecoder() { diff --git a/unicode/cldr/makexml.go b/unicode/cldr/makexml.go index eb26306df..d82a45ba7 100644 --- a/unicode/cldr/makexml.go +++ b/unicode/cldr/makexml.go @@ -20,7 +20,7 @@ import ( "regexp" "strings" - "golang.org/x/text/internal/gen" + "github.com/liquid-dev/text/internal/gen" ) var outputFile = flag.String("output", "xml.go", "output file name") diff --git a/unicode/norm/example_iter_test.go b/unicode/norm/example_iter_test.go index 998d89668..79ae1f520 100644 --- a/unicode/norm/example_iter_test.go +++ b/unicode/norm/example_iter_test.go @@ -10,7 +10,7 @@ import ( "io" "unicode/utf8" - "golang.org/x/text/unicode/norm" + "github.com/liquid-dev/text/unicode/norm" ) // EqualSimple uses a norm.Iter to compare two non-normalized diff --git a/unicode/norm/example_test.go b/unicode/norm/example_test.go index 8f3b15653..040225ead 100644 --- a/unicode/norm/example_test.go +++ b/unicode/norm/example_test.go @@ -7,7 +7,7 @@ package norm_test import ( "fmt" - "golang.org/x/text/unicode/norm" + "github.com/liquid-dev/text/unicode/norm" ) func ExampleForm_NextBoundary() { diff --git a/unicode/norm/maketables.go b/unicode/norm/maketables.go index 30a3aa933..459196108 100644 --- a/unicode/norm/maketables.go +++ b/unicode/norm/maketables.go @@ -21,9 +21,9 @@ import ( "strconv" "strings" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/triegen" - "golang.org/x/text/internal/ucd" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/triegen" + "github.com/liquid-dev/text/internal/ucd" ) func main() { diff --git a/unicode/norm/normalize.go b/unicode/norm/normalize.go index 95efcf26e..2f920887e 100644 --- a/unicode/norm/normalize.go +++ b/unicode/norm/normalize.go @@ -7,12 +7,12 @@ //go:generate go test -tags test // Package norm contains types and functions for normalizing Unicode strings. -package norm // import "golang.org/x/text/unicode/norm" +package norm // import "github.com/liquid-dev/text/unicode/norm" import ( "unicode/utf8" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/transform" ) // A Form denotes a canonical representation of Unicode code points. diff --git a/unicode/norm/normalize_test.go b/unicode/norm/normalize_test.go index c5b322a04..6d8d85a6c 100644 --- a/unicode/norm/normalize_test.go +++ b/unicode/norm/normalize_test.go @@ -14,8 +14,8 @@ import ( "testing" "unicode/utf8" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/transform" ) var ( @@ -924,7 +924,7 @@ func TestLinking(t *testing.T) { const prog = ` package main import "fmt" - import "golang.org/x/text/unicode/norm" + import "github.com/liquid-dev/text/unicode/norm" func main() { fmt.Println(norm.%s) } ` baseline, errB := testtext.CodeSize(fmt.Sprintf(prog, "MaxSegmentSize")) diff --git a/unicode/norm/transform.go b/unicode/norm/transform.go index a1d366ae4..d0ce5e333 100644 --- a/unicode/norm/transform.go +++ b/unicode/norm/transform.go @@ -7,7 +7,7 @@ package norm import ( "unicode/utf8" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/transform" ) // Reset implements the Reset method of the transform.Transformer interface. diff --git a/unicode/norm/transform_test.go b/unicode/norm/transform_test.go index 2690fc360..e9fcadf91 100644 --- a/unicode/norm/transform_test.go +++ b/unicode/norm/transform_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/transform" ) func TestTransform(t *testing.T) { diff --git a/unicode/norm/ucd_test.go b/unicode/norm/ucd_test.go index edde55f0f..0a2f4d06c 100644 --- a/unicode/norm/ucd_test.go +++ b/unicode/norm/ucd_test.go @@ -17,8 +17,8 @@ import ( "time" "unicode/utf8" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/testtext" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/testtext" ) var once sync.Once diff --git a/unicode/rangetable/gen.go b/unicode/rangetable/gen.go index c2d36741c..8686e9dd7 100644 --- a/unicode/rangetable/gen.go +++ b/unicode/rangetable/gen.go @@ -16,11 +16,11 @@ import ( "strings" "unicode" - "golang.org/x/text/collate" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/ucd" - "golang.org/x/text/language" - "golang.org/x/text/unicode/rangetable" + "github.com/liquid-dev/text/collate" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/ucd" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/unicode/rangetable" ) var versionList = flag.String("versions", "", diff --git a/unicode/runenames/example_test.go b/unicode/runenames/example_test.go index 70e225151..d9c4b4828 100644 --- a/unicode/runenames/example_test.go +++ b/unicode/runenames/example_test.go @@ -7,7 +7,7 @@ package runenames_test import ( "fmt" - "golang.org/x/text/unicode/runenames" + "github.com/liquid-dev/text/unicode/runenames" ) func Example() { diff --git a/unicode/runenames/gen.go b/unicode/runenames/gen.go index 5633ba62d..0f60d4f76 100644 --- a/unicode/runenames/gen.go +++ b/unicode/runenames/gen.go @@ -12,9 +12,9 @@ import ( "sort" "strings" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/gen/bitfield" - "golang.org/x/text/internal/ucd" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/gen/bitfield" + "github.com/liquid-dev/text/internal/ucd" ) var ( diff --git a/unicode/runenames/runenames_test.go b/unicode/runenames/runenames_test.go index 655323d4b..0756bf379 100644 --- a/unicode/runenames/runenames_test.go +++ b/unicode/runenames/runenames_test.go @@ -9,9 +9,9 @@ import ( "testing" "unicode" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/internal/ucd" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/internal/ucd" ) func TestName(t *testing.T) { diff --git a/width/common_test.go b/width/common_test.go index 9ebb782c0..57841a8ec 100644 --- a/width/common_test.go +++ b/width/common_test.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/ucd" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/ucd" ) var ( diff --git a/width/example_test.go b/width/example_test.go index 62adba660..4c17f2df3 100644 --- a/width/example_test.go +++ b/width/example_test.go @@ -7,7 +7,7 @@ package width_test import ( "fmt" - "golang.org/x/text/width" + "github.com/liquid-dev/text/width" ) func ExampleTransformer_fold() { diff --git a/width/gen.go b/width/gen.go index 092277e1f..72f13b5b2 100644 --- a/width/gen.go +++ b/width/gen.go @@ -16,8 +16,8 @@ import ( "math" "unicode/utf8" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/triegen" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/triegen" ) // See gen_common.go for flags. diff --git a/width/gen_common.go b/width/gen_common.go index 601e75268..1c9f3e7c5 100644 --- a/width/gen_common.go +++ b/width/gen_common.go @@ -14,8 +14,8 @@ import ( "strconv" "strings" - "golang.org/x/text/internal/gen" - "golang.org/x/text/internal/ucd" + "github.com/liquid-dev/text/internal/gen" + "github.com/liquid-dev/text/internal/ucd" ) var ( diff --git a/width/tables_test.go b/width/tables_test.go index 706c1716a..fdafbc42c 100644 --- a/width/tables_test.go +++ b/width/tables_test.go @@ -7,7 +7,7 @@ package width import ( "testing" - "golang.org/x/text/internal/testtext" + "github.com/liquid-dev/text/internal/testtext" ) const ( diff --git a/width/transform.go b/width/transform.go index 0049f700a..e4d3db2e0 100644 --- a/width/transform.go +++ b/width/transform.go @@ -7,7 +7,7 @@ package width import ( "unicode/utf8" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/transform" ) type foldTransform struct { diff --git a/width/transform_test.go b/width/transform_test.go index f9122d6db..5225bf8ad 100644 --- a/width/transform_test.go +++ b/width/transform_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "golang.org/x/text/internal/testtext" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/internal/testtext" + "github.com/liquid-dev/text/transform" ) func foldRune(r rune) (folded rune, ok bool) { diff --git a/width/width.go b/width/width.go index 29c7509be..b1e882b5d 100644 --- a/width/width.go +++ b/width/width.go @@ -13,12 +13,12 @@ // layout. // // For more information, see https://unicode.org/reports/tr11/. -package width // import "golang.org/x/text/width" +package width // import "github.com/liquid-dev/text/width" import ( "unicode/utf8" - "golang.org/x/text/transform" + "github.com/liquid-dev/text/transform" ) // TODO From 929e72ca90deac4784bbe451caf10faa5b256ebe Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 14 Nov 2019 15:00:43 +0100 Subject: [PATCH 4/5] message/pipeline: detect unknown keys When (d *dictionary) Lookup() is called on an non-existing key, the `messageKeyToIndex[key]` returns 0. As 0 is also a valid entry in messageKeyToIndex, the method returned the wrong value rather than fail. Fixes golang/go#35587 Change-Id: Iedd1cf42f29335c2c2052b07993d7f2dfcd3cc6c Reviewed-on: https://go-review.googlesource.com/c/text/+/207217 Run-TryBot: Jason A. Donenfeld TryBot-Result: Gobot Gobot Reviewed-by: Marcel van Lohuizen --- cmd/gotext/examples/extract/catalog.go | 5 ++++- cmd/gotext/examples/extract_http/catalog_gen.go | 5 ++++- message/pipeline/generate.go | 5 ++++- message/pipeline/testdata/ssa/catalog_gen.go | 5 ++++- message/pipeline/testdata/test1/catalog_gen.go.want | 5 ++++- message/pipeline/testdata/test1/catalog_test.go | 4 ++++ 6 files changed, 24 insertions(+), 5 deletions(-) diff --git a/cmd/gotext/examples/extract/catalog.go b/cmd/gotext/examples/extract/catalog.go index bc6130a69..65570f824 100644 --- a/cmd/gotext/examples/extract/catalog.go +++ b/cmd/gotext/examples/extract/catalog.go @@ -14,7 +14,10 @@ type dictionary struct { } func (d *dictionary) Lookup(key string) (data string, ok bool) { - p := messageKeyToIndex[key] + p, ok := messageKeyToIndex[key] + if !ok { + return "", false + } start, end := d.index[p], d.index[p+1] if start == end { return "", false diff --git a/cmd/gotext/examples/extract_http/catalog_gen.go b/cmd/gotext/examples/extract_http/catalog_gen.go index 2c410dcdb..4327d34e4 100644 --- a/cmd/gotext/examples/extract_http/catalog_gen.go +++ b/cmd/gotext/examples/extract_http/catalog_gen.go @@ -14,7 +14,10 @@ type dictionary struct { } func (d *dictionary) Lookup(key string) (data string, ok bool) { - p := messageKeyToIndex[key] + p, ok := messageKeyToIndex[key] + if !ok { + return "", false + } start, end := d.index[p], d.index[p+1] if start == end { return "", false diff --git a/message/pipeline/generate.go b/message/pipeline/generate.go index 2770d1449..bb1f85b94 100644 --- a/message/pipeline/generate.go +++ b/message/pipeline/generate.go @@ -297,7 +297,10 @@ type dictionary struct { } func (d *dictionary) Lookup(key string) (data string, ok bool) { - p := messageKeyToIndex[key] + p, ok := messageKeyToIndex[key] + if !ok { + return "", false + } start, end := d.index[p], d.index[p+1] if start == end { return "", false diff --git a/message/pipeline/testdata/ssa/catalog_gen.go b/message/pipeline/testdata/ssa/catalog_gen.go index 539d74173..dce54afd5 100644 --- a/message/pipeline/testdata/ssa/catalog_gen.go +++ b/message/pipeline/testdata/ssa/catalog_gen.go @@ -14,7 +14,10 @@ type dictionary struct { } func (d *dictionary) Lookup(key string) (data string, ok bool) { - p := messageKeyToIndex[key] + p, ok := messageKeyToIndex[key] + if !ok { + return "", false + } start, end := d.index[p], d.index[p+1] if start == end { return "", false diff --git a/message/pipeline/testdata/test1/catalog_gen.go.want b/message/pipeline/testdata/test1/catalog_gen.go.want index 7d93f4868..890ef51ab 100644 --- a/message/pipeline/testdata/test1/catalog_gen.go.want +++ b/message/pipeline/testdata/test1/catalog_gen.go.want @@ -14,7 +14,10 @@ type dictionary struct { } func (d *dictionary) Lookup(key string) (data string, ok bool) { - p := messageKeyToIndex[key] + p, ok := messageKeyToIndex[key] + if !ok { + return "", false + } start, end := d.index[p], d.index[p+1] if start == end { return "", false diff --git a/message/pipeline/testdata/test1/catalog_test.go b/message/pipeline/testdata/test1/catalog_test.go index eeb7c25f4..34f8b8611 100644 --- a/message/pipeline/testdata/test1/catalog_test.go +++ b/message/pipeline/testdata/test1/catalog_test.go @@ -22,6 +22,10 @@ func TestCatalog(t *testing.T) { lang: "en", key: "Hello world!\n", want: "Hello world!\n", + }, { + lang: "en", + key: "non-existing-key\n", + want: "non-existing-key\n", }, { lang: "de", key: "Hello world!\n", From 5e6ac7cfbda4266f216a8de46e469a0b8d61909f Mon Sep 17 00:00:00 2001 From: nas Date: Wed, 5 Feb 2020 17:15:10 +0900 Subject: [PATCH 5/5] :+1: Replace golang.org/x => github.com/liquid-dev retry --- README.md | 8 +++---- cases/cases.go | 2 +- cases/tables10.0.0.go | 2 +- cases/tables10.0.0_test.go | 2 +- cases/tables11.0.0.go | 2 +- cases/tables11.0.0_test.go | 2 +- cases/tables12.0.0.go | 2 +- cases/tables12.0.0_test.go | 2 +- cases/tables9.0.0.go | 2 +- cases/tables9.0.0_test.go | 2 +- cases/trieval.go | 2 +- cmd/gotext/examples/extract/catalog.go | 2 +- .../extract/locales/de/messages.gotext.json | 20 ++++++++-------- .../extract/locales/de/out.gotext.json | 4 ++-- .../locales/en-US/messages.gotext.json | 2 +- .../extract/locales/en-US/out.gotext.json | 4 ++-- .../extract/locales/zh/messages.gotext.json | 24 +++++++++---------- .../extract/locales/zh/out.gotext.json | 4 ++-- .../examples/extract_http/catalog_gen.go | 2 +- .../extract_http/locales/de/out.gotext.json | 6 ++--- .../locales/en-US/out.gotext.json | 6 ++--- collate/tables.go | 2 +- currency/common.go | 2 +- currency/tables.go | 2 +- date/data_test.go | 2 +- date/tables.go | 2 +- doc.go | 2 +- encoding/charmap/tables.go | 2 +- encoding/encoding.go | 4 ++-- encoding/htmlindex/tables.go | 2 +- encoding/ianaindex/tables.go | 2 +- encoding/internal/identifier/mib.go | 2 +- encoding/unicode/utf32/utf32.go | 2 +- feature/plural/common.go | 2 +- feature/plural/data_test.go | 2 +- feature/plural/tables.go | 2 +- gen.go | 2 +- internal/cldrtree/testdata/test1/output.go | 2 +- internal/cldrtree/testdata/test2/output.go | 2 +- internal/export/idna/common_test.go | 2 +- internal/export/idna/tables10.0.0.go | 2 +- internal/export/idna/tables11.0.0.go | 2 +- internal/export/idna/tables12.0.0.go | 2 +- internal/export/idna/tables9.0.0.go | 2 +- internal/export/idna/trieval.go | 2 +- internal/gen/bitfield/bitfield.go | 2 +- internal/gen/bitfield/gen1_test.go | 2 +- internal/gen/bitfield/gen2_test.go | 2 +- internal/gen/gen.go | 6 ++--- internal/language/common.go | 2 +- internal/language/compact/parents.go | 2 +- internal/language/compact/tables.go | 2 +- internal/language/tables.go | 2 +- internal/number/common.go | 2 +- internal/number/tables.go | 2 +- language/display/tables.go | 2 +- language/tables.go | 2 +- message/doc.go | 6 ++--- message/pipeline/extract.go | 2 +- message/pipeline/pipeline_test.go | 4 ++-- message/pipeline/rewrite.go | 2 +- message/pipeline/testdata/ssa/catalog_gen.go | 2 +- .../pipeline/testdata/test1/catalog_gen.go | 2 +- .../testdata/test1/catalog_gen.go.want | 8 +++---- search/tables.go | 2 +- secure/precis/tables10.0.0.go | 2 +- secure/precis/tables11.0.0.go | 2 +- secure/precis/tables12.0.0.go | 2 +- secure/precis/tables9.0.0.go | 2 +- secure/precis/trieval.go | 2 +- unicode/bidi/ranges_test.go | 2 +- unicode/bidi/tables10.0.0.go | 2 +- unicode/bidi/tables11.0.0.go | 2 +- unicode/bidi/tables12.0.0.go | 2 +- unicode/bidi/tables9.0.0.go | 2 +- unicode/bidi/trieval.go | 2 +- unicode/cldr/xml.go | 2 +- unicode/doc.go | 2 +- unicode/norm/data10.0.0_test.go | 2 +- unicode/norm/data11.0.0_test.go | 2 +- unicode/norm/data12.0.0_test.go | 2 +- unicode/norm/data9.0.0_test.go | 2 +- unicode/norm/tables10.0.0.go | 2 +- unicode/norm/tables11.0.0.go | 2 +- unicode/norm/tables12.0.0.go | 2 +- unicode/norm/tables9.0.0.go | 2 +- unicode/rangetable/tables10.0.0.go | 2 +- unicode/rangetable/tables11.0.0.go | 2 +- unicode/rangetable/tables12.0.0.go | 2 +- unicode/rangetable/tables9.0.0.go | 2 +- unicode/runenames/tables10.0.0.go | 2 +- unicode/runenames/tables11.0.0.go | 2 +- unicode/runenames/tables12.0.0.go | 2 +- unicode/runenames/tables9.0.0.go | 2 +- width/common_test.go | 2 +- width/runes_test.go | 2 +- width/tables10.0.0.go | 2 +- width/tables11.0.0.go | 2 +- width/tables12.0.0.go | 2 +- width/tables9.0.0.go | 2 +- width/trieval.go | 2 +- width/width.go | 2 +- 102 files changed, 141 insertions(+), 141 deletions(-) diff --git a/README.md b/README.md index 61d5ee4d1..c35975046 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,8 @@ moment this is supported for Go compilers from version 1.7. ## Download/Install -The easiest way to install is to run `go get -u golang.org/x/text`. You can -also manually git clone the repository to `$GOPATH/src/golang.org/x/text`. +The easiest way to install is to run `go get -u github.com/liquid-dev/text`. You can +also manually git clone the repository to `$GOPATH/src/github.com/liquid-dev/text`. ## Contribute To submit changes to this repository, see http://golang.org/doc/contribute.html. @@ -32,7 +32,7 @@ To submit changes to this repository, see http://golang.org/doc/contribute.html. To generate the tables in this repository (except for the encoding tables), run go generate from this directory. By default tables are generated for the Unicode version in core and the CLDR version defined in -golang.org/x/text/unicode/cldr. +github.com/liquid-dev/text/unicode/cldr. Running go generate will as a side effect create a DATA subdirectory in this directory, which holds all files that are used as a source for generating the @@ -55,7 +55,7 @@ TODO: To generate the tables in this repository (except for the encoding tables), run `go generate` from this directory. By default tables are generated for the Unicode version in core and the CLDR version defined in -golang.org/x/text/unicode/cldr. +github.com/liquid-dev/text/unicode/cldr. Running go generate will as a side effect create a DATA subdirectory in this directory which holds all files that are used as a source for generating the diff --git a/cases/cases.go b/cases/cases.go index caf494ee5..a8c657c5c 100644 --- a/cases/cases.go +++ b/cases/cases.go @@ -88,7 +88,7 @@ func Title(t language.Tag, opts ...Option) Caser { // // Case folding does not normalize the input and may not preserve a normal form. // Use the collate or search package for more convenient and linguistically -// sound comparisons. Use golang.org/x/text/secure/precis for string comparisons +// sound comparisons. Use github.com/liquid-dev/text/secure/precis for string comparisons // where security aspects are a concern. func Fold(opts ...Option) Caser { return Caser{makeFold(getOpts(opts...))} diff --git a/cases/tables10.0.0.go b/cases/tables10.0.0.go index 5c87950cc..de4ca976f 100644 --- a/cases/tables10.0.0.go +++ b/cases/tables10.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.10,!go1.13 diff --git a/cases/tables10.0.0_test.go b/cases/tables10.0.0_test.go index 186065c9f..b6b622012 100644 --- a/cases/tables10.0.0_test.go +++ b/cases/tables10.0.0_test.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.10,!go1.13 diff --git a/cases/tables11.0.0.go b/cases/tables11.0.0.go index 84d270183..4565fba85 100644 --- a/cases/tables11.0.0.go +++ b/cases/tables11.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.13,!go1.14 diff --git a/cases/tables11.0.0_test.go b/cases/tables11.0.0_test.go index 2f441af6b..203084eb1 100644 --- a/cases/tables11.0.0_test.go +++ b/cases/tables11.0.0_test.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.13,!go1.14 diff --git a/cases/tables12.0.0.go b/cases/tables12.0.0.go index 875a21b4b..8deacd150 100644 --- a/cases/tables12.0.0.go +++ b/cases/tables12.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.14 diff --git a/cases/tables12.0.0_test.go b/cases/tables12.0.0_test.go index fdce76171..a76f3d850 100644 --- a/cases/tables12.0.0_test.go +++ b/cases/tables12.0.0_test.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.14 diff --git a/cases/tables9.0.0.go b/cases/tables9.0.0.go index 4949fa724..5ed467bbf 100644 --- a/cases/tables9.0.0.go +++ b/cases/tables9.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build !go1.10 diff --git a/cases/tables9.0.0_test.go b/cases/tables9.0.0_test.go index 398d25331..d3b97acf9 100644 --- a/cases/tables9.0.0_test.go +++ b/cases/tables9.0.0_test.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build !go1.10 diff --git a/cases/trieval.go b/cases/trieval.go index 99e039628..270185a23 100644 --- a/cases/trieval.go +++ b/cases/trieval.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package cases diff --git a/cmd/gotext/examples/extract/catalog.go b/cmd/gotext/examples/extract/catalog.go index 10614a0b0..e2b44a400 100644 --- a/cmd/gotext/examples/extract/catalog.go +++ b/cmd/gotext/examples/extract/catalog.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package main diff --git a/cmd/gotext/examples/extract/locales/de/messages.gotext.json b/cmd/gotext/examples/extract/locales/de/messages.gotext.json index 5e1d3b396..04f66c961 100755 --- a/cmd/gotext/examples/extract/locales/de/messages.gotext.json +++ b/cmd/gotext/examples/extract/locales/de/messages.gotext.json @@ -6,7 +6,7 @@ "key": "Hello world!\n", "message": "Hello world!", "translation": "Hallo Welt!", - "position": "golang.org/x/text/cmd/gotext/examples/extract/main.go:27:10" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract/main.go:27:10" }, { "id": "Hello {City}!", @@ -23,7 +23,7 @@ "expr": "city" } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract/main.go:31:10" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract/main.go:31:10" }, { "id": "Hello {Town}!", @@ -41,7 +41,7 @@ "comment": "Town" } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract/main.go:35:10" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract/main.go:35:10" }, { "id": "{Person} is visiting {Place}!", @@ -68,7 +68,7 @@ "comment": "Place the person is visiting." } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract/main.go:40:10" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract/main.go:40:10" }, { "id": "{Person} is visiting {Place}!", @@ -103,7 +103,7 @@ "expr": "pp.extra" } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract/main.go:55:10" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract/main.go:55:10" }, { "id": "{N} more files remaining!", @@ -120,7 +120,7 @@ "expr": "n" } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract/main.go:67:10" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract/main.go:67:10" }, { "id": "Use the following code for your discount: {ReferralCode}", @@ -131,13 +131,13 @@ { "id": "ReferralCode", "string": "%[1]d", - "type": "golang.org/x/text/cmd/gotext/examples/extract.referralCode", + "type": "github.com/liquid-dev/text/cmd/gotext/examples/extract.referralCode", "underlyingType": "int", "argNum": 1, "expr": "c" } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract/main.go:73:10" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract/main.go:73:10" }, { "id": [ "msgOutOfOrder", "{Device} is out of order!" ], @@ -155,7 +155,7 @@ "expr": "device" } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract/main.go:81:10" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract/main.go:81:10" }, { "id": "{Miles} miles traveled ({Miles_1})", @@ -180,7 +180,7 @@ "expr": "miles" } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract/main.go:85:10" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract/main.go:85:10" } ] } diff --git a/cmd/gotext/examples/extract/locales/de/out.gotext.json b/cmd/gotext/examples/extract/locales/de/out.gotext.json index 696eeb70e..e714050b4 100755 --- a/cmd/gotext/examples/extract/locales/de/out.gotext.json +++ b/cmd/gotext/examples/extract/locales/de/out.gotext.json @@ -84,7 +84,7 @@ { "id": "ReferralCode", "string": "%[1]d", - "type": "golang.org/x/text/cmd/gotext/examples/extract.referralCode", + "type": "github.com/liquid-dev/text/cmd/gotext/examples/extract.referralCode", "underlyingType": "int", "argNum": 1, "expr": "c" @@ -134,4 +134,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/cmd/gotext/examples/extract/locales/en-US/messages.gotext.json b/cmd/gotext/examples/extract/locales/en-US/messages.gotext.json index 5f6f8b03c..7694593b6 100755 --- a/cmd/gotext/examples/extract/locales/en-US/messages.gotext.json +++ b/cmd/gotext/examples/extract/locales/en-US/messages.gotext.json @@ -6,7 +6,7 @@ "key": "Hello world!\n", "message": "Hello world!", "translation": "Hello world!", - "position": "golang.org/x/text/cmd/gotext/examples/extract/main.go:27:10" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract/main.go:27:10" }, { "id": "Hello {City}!", diff --git a/cmd/gotext/examples/extract/locales/en-US/out.gotext.json b/cmd/gotext/examples/extract/locales/en-US/out.gotext.json index 31785bf80..d1a69a524 100755 --- a/cmd/gotext/examples/extract/locales/en-US/out.gotext.json +++ b/cmd/gotext/examples/extract/locales/en-US/out.gotext.json @@ -100,7 +100,7 @@ { "id": "ReferralCode", "string": "%[1]d", - "type": "golang.org/x/text/cmd/gotext/examples/extract.referralCode", + "type": "github.com/liquid-dev/text/cmd/gotext/examples/extract.referralCode", "underlyingType": "int", "argNum": 1, "expr": "c" @@ -151,4 +151,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/cmd/gotext/examples/extract/locales/zh/messages.gotext.json b/cmd/gotext/examples/extract/locales/zh/messages.gotext.json index 9913f832b..1f92e8214 100755 --- a/cmd/gotext/examples/extract/locales/zh/messages.gotext.json +++ b/cmd/gotext/examples/extract/locales/zh/messages.gotext.json @@ -6,7 +6,7 @@ "key": "Hello world!\n", "message": "Hello world!", "translation": "", - "position": "golang.org/x/text/cmd/gotext/examples/extract/main.go:27:10" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract/main.go:27:10" }, { "id": "Hello {City}!", @@ -23,7 +23,7 @@ "expr": "city" } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract/main.go:31:10" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract/main.go:31:10" }, { "id": "Hello {Town}!", @@ -41,7 +41,7 @@ "comment": "Town" } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract/main.go:35:10" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract/main.go:35:10" }, { "id": "{Person} is visiting {Place}!", @@ -68,7 +68,7 @@ "comment": "Place the person is visiting." } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract/main.go:40:10" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract/main.go:40:10" }, { "id": "{Person} is visiting {Place}!", @@ -103,7 +103,7 @@ "expr": "pp.extra" } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract/main.go:55:10" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract/main.go:55:10" }, { "id": "{} files remaining!", @@ -120,7 +120,7 @@ "expr": "2" } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract/main.go:62:10" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract/main.go:62:10" }, { "id": "{N} more files remaining!", @@ -137,7 +137,7 @@ "expr": "n" } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract/main.go:67:10" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract/main.go:67:10" }, { "id": "Use the following code for your discount: {ReferralCode}\n", @@ -148,13 +148,13 @@ { "id": "ReferralCode", "string": "%[1]d", - "type": "golang.org/x/text/cmd/gotext/examples/extract.referralCode", + "type": "github.com/liquid-dev/text/cmd/gotext/examples/extract.referralCode", "underlyingType": "int", "argNum": 1, "expr": "c" } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract/main.go:73:10" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract/main.go:73:10" }, { "id": [ "{Device} is out of order!", "msgOutOfOrder" ], @@ -172,7 +172,7 @@ "expr": "device" } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract/main.go:81:10" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract/main.go:81:10" }, { "id": "{Miles} miles traveled ({Miles_1})", @@ -197,7 +197,7 @@ "expr": "miles" } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract/main.go:85:10" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract/main.go:85:10" } ] -} \ No newline at end of file +} diff --git a/cmd/gotext/examples/extract/locales/zh/out.gotext.json b/cmd/gotext/examples/extract/locales/zh/out.gotext.json index 946573ec6..482fb1a2e 100755 --- a/cmd/gotext/examples/extract/locales/zh/out.gotext.json +++ b/cmd/gotext/examples/extract/locales/zh/out.gotext.json @@ -84,7 +84,7 @@ { "id": "ReferralCode", "string": "%[1]d", - "type": "golang.org/x/text/cmd/gotext/examples/extract.referralCode", + "type": "github.com/liquid-dev/text/cmd/gotext/examples/extract.referralCode", "underlyingType": "int", "argNum": 1, "expr": "c" @@ -134,4 +134,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/cmd/gotext/examples/extract_http/catalog_gen.go b/cmd/gotext/examples/extract_http/catalog_gen.go index de59cf117..ef4ba8639 100644 --- a/cmd/gotext/examples/extract_http/catalog_gen.go +++ b/cmd/gotext/examples/extract_http/catalog_gen.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package main diff --git a/cmd/gotext/examples/extract_http/locales/de/out.gotext.json b/cmd/gotext/examples/extract_http/locales/de/out.gotext.json index d8437c01f..b196691d5 100755 --- a/cmd/gotext/examples/extract_http/locales/de/out.gotext.json +++ b/cmd/gotext/examples/extract_http/locales/de/out.gotext.json @@ -16,7 +16,7 @@ "expr": "r.Header.Get(\"From\")" } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract_http/pkg/pkg.go:22:11" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract_http/pkg/pkg.go:22:11" }, { "id": "Do you like your browser ({User_Agent})?", @@ -33,7 +33,7 @@ "expr": "r.Header.Get(\"User-Agent\")" } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract_http/pkg/pkg.go:24:11" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract_http/pkg/pkg.go:24:11" } ] -} \ No newline at end of file +} diff --git a/cmd/gotext/examples/extract_http/locales/en-US/out.gotext.json b/cmd/gotext/examples/extract_http/locales/en-US/out.gotext.json index de59eca1d..71f2937cd 100755 --- a/cmd/gotext/examples/extract_http/locales/en-US/out.gotext.json +++ b/cmd/gotext/examples/extract_http/locales/en-US/out.gotext.json @@ -16,7 +16,7 @@ "expr": "r.Header.Get(\"From\")" } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract_http/pkg/pkg.go:22:11" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract_http/pkg/pkg.go:22:11" }, { "id": "Do you like your browser ({User_Agent})?", @@ -33,7 +33,7 @@ "expr": "r.Header.Get(\"User-Agent\")" } ], - "position": "golang.org/x/text/cmd/gotext/examples/extract_http/pkg/pkg.go:24:11" + "position": "github.com/liquid-dev/text/cmd/gotext/examples/extract_http/pkg/pkg.go:24:11" } ] -} \ No newline at end of file +} diff --git a/collate/tables.go b/collate/tables.go index 9ec4f3d49..355b1b351 100644 --- a/collate/tables.go +++ b/collate/tables.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package collate diff --git a/currency/common.go b/currency/common.go index 586b77ad8..cb2835298 100644 --- a/currency/common.go +++ b/currency/common.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package currency diff --git a/currency/tables.go b/currency/tables.go index 4e7c2e63a..d304b311a 100644 --- a/currency/tables.go +++ b/currency/tables.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package currency diff --git a/date/data_test.go b/date/data_test.go index eb388cbc5..981c7ef84 100644 --- a/date/data_test.go +++ b/date/data_test.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package date diff --git a/date/tables.go b/date/tables.go index 59be3ee02..e90e76197 100644 --- a/date/tables.go +++ b/date/tables.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package date diff --git a/doc.go b/doc.go index 2e19a419c..74f90e38a 100644 --- a/doc.go +++ b/doc.go @@ -9,7 +9,7 @@ // transformations, and locale-specific text handling. // // There is a 30 minute video, recorded on 2017-11-30, on the "State of -// golang.org/x/text" at https://www.youtube.com/watch?v=uYrDrMEGu58 +// github.com/liquid-dev/text" at https://www.youtube.com/watch?v=uYrDrMEGu58 package text // TODO: more documentation on general concepts, such as Transformers, use diff --git a/encoding/charmap/tables.go b/encoding/charmap/tables.go index a69634174..5128203b7 100644 --- a/encoding/charmap/tables.go +++ b/encoding/charmap/tables.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package charmap diff --git a/encoding/encoding.go b/encoding/encoding.go index ce6da6f10..1c5b46cf3 100644 --- a/encoding/encoding.go +++ b/encoding/encoding.go @@ -6,8 +6,8 @@ // JIS and Windows 1252, that can convert to and from UTF-8. // // Encoding implementations are provided in other packages, such as -// golang.org/x/text/encoding/charmap and -// golang.org/x/text/encoding/japanese. +// github.com/liquid-dev/text/encoding/charmap and +// github.com/liquid-dev/text/encoding/japanese. package encoding // import "github.com/liquid-dev/text/encoding" import ( diff --git a/encoding/htmlindex/tables.go b/encoding/htmlindex/tables.go index f074e2c6d..a38d606e4 100644 --- a/encoding/htmlindex/tables.go +++ b/encoding/htmlindex/tables.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package htmlindex diff --git a/encoding/ianaindex/tables.go b/encoding/ianaindex/tables.go index f398deae1..b7e113065 100644 --- a/encoding/ianaindex/tables.go +++ b/encoding/ianaindex/tables.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package ianaindex diff --git a/encoding/internal/identifier/mib.go b/encoding/internal/identifier/mib.go index fc7df1bc7..64bbf35b6 100644 --- a/encoding/internal/identifier/mib.go +++ b/encoding/internal/identifier/mib.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package identifier diff --git a/encoding/unicode/utf32/utf32.go b/encoding/unicode/utf32/utf32.go index 731640c72..7a9bb774b 100644 --- a/encoding/unicode/utf32/utf32.go +++ b/encoding/unicode/utf32/utf32.go @@ -109,7 +109,7 @@ const ( // ExpectBOM means that the UTF-32 form must start with a byte order mark, // which will be used to override the default encoding. ExpectBOM BOMPolicy = writeBOM | acceptBOM | requireBOM - // Consistent with BOMPolicy definition in golang.org/x/text/encoding/unicode + // Consistent with BOMPolicy definition in github.com/liquid-dev/text/encoding/unicode ) // Endianness is a UTF-32 encoding's default endianness. diff --git a/feature/plural/common.go b/feature/plural/common.go index fdcb373fd..21b1bd0e5 100644 --- a/feature/plural/common.go +++ b/feature/plural/common.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package plural diff --git a/feature/plural/data_test.go b/feature/plural/data_test.go index bd4c240f9..144b13281 100644 --- a/feature/plural/data_test.go +++ b/feature/plural/data_test.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package plural diff --git a/feature/plural/tables.go b/feature/plural/tables.go index 59ae9f240..ca995f763 100644 --- a/feature/plural/tables.go +++ b/feature/plural/tables.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package plural diff --git a/gen.go b/gen.go index ad74ada20..dd3806e58 100644 --- a/gen.go +++ b/gen.go @@ -269,7 +269,7 @@ func copyPackage(dirSrc, dirDst, search, replace string) { b = bytes.Replace(b, []byte("internal/export"), []byte(""), -1) // Remove go:generate lines. b = goGenRE.ReplaceAllLiteral(b, nil) - comment := "// Code generated by running \"go generate\" in golang.org/x/text. DO NOT EDIT.\n\n" + comment := "// Code generated by running \"go generate\" in github.com/liquid-dev/text. DO NOT EDIT.\n\n" if !bytes.HasPrefix(b, []byte(comment)) { b = append([]byte(comment), b...) } diff --git a/internal/cldrtree/testdata/test1/output.go b/internal/cldrtree/testdata/test1/output.go index f36d7dda3..e80b7c41c 100644 --- a/internal/cldrtree/testdata/test1/output.go +++ b/internal/cldrtree/testdata/test1/output.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package test diff --git a/internal/cldrtree/testdata/test2/output.go b/internal/cldrtree/testdata/test2/output.go index 033bff438..a2eec80ed 100644 --- a/internal/cldrtree/testdata/test2/output.go +++ b/internal/cldrtree/testdata/test2/output.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package test diff --git a/internal/export/idna/common_test.go b/internal/export/idna/common_test.go index ac73ca93b..f8b15c63d 100644 --- a/internal/export/idna/common_test.go +++ b/internal/export/idna/common_test.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package idna diff --git a/internal/export/idna/tables10.0.0.go b/internal/export/idna/tables10.0.0.go index 54fddb4b1..f3cd16957 100644 --- a/internal/export/idna/tables10.0.0.go +++ b/internal/export/idna/tables10.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.10,!go1.13 diff --git a/internal/export/idna/tables11.0.0.go b/internal/export/idna/tables11.0.0.go index 8ce0811fd..8a13e3817 100644 --- a/internal/export/idna/tables11.0.0.go +++ b/internal/export/idna/tables11.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.13,!go1.14 diff --git a/internal/export/idna/tables12.0.0.go b/internal/export/idna/tables12.0.0.go index f4b8ea363..d570a2fef 100644 --- a/internal/export/idna/tables12.0.0.go +++ b/internal/export/idna/tables12.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.14 diff --git a/internal/export/idna/tables9.0.0.go b/internal/export/idna/tables9.0.0.go index 8b65fa167..d1f7d201e 100644 --- a/internal/export/idna/tables9.0.0.go +++ b/internal/export/idna/tables9.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build !go1.10 diff --git a/internal/export/idna/trieval.go b/internal/export/idna/trieval.go index 7a8cf889b..30f0f18bb 100644 --- a/internal/export/idna/trieval.go +++ b/internal/export/idna/trieval.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package idna diff --git a/internal/gen/bitfield/bitfield.go b/internal/gen/bitfield/bitfield.go index a8d0a48d8..7d2fcfae9 100644 --- a/internal/gen/bitfield/bitfield.go +++ b/internal/gen/bitfield/bitfield.go @@ -211,7 +211,7 @@ func Gen(w io.Writer, x interface{}, c *Config) error { } if c.Package != "" { - print(w, "// Code generated by golang.org/x/text/internal/gen/bitfield. DO NOT EDIT.\n") + print(w, "// Code generated by github.com/liquid-dev/text/internal/gen/bitfield. DO NOT EDIT.\n") print(w, "package %s\n", c.Package) } diff --git a/internal/gen/bitfield/gen1_test.go b/internal/gen/bitfield/gen1_test.go index 2844b9df2..466c58407 100644 --- a/internal/gen/bitfield/gen1_test.go +++ b/internal/gen/bitfield/gen1_test.go @@ -1,4 +1,4 @@ -// Code generated by golang.org/x/text/internal/gen/bitfield. DO NOT EDIT. +// Code generated by github.com/liquid-dev/text/internal/gen/bitfield. DO NOT EDIT. package bitfield diff --git a/internal/gen/bitfield/gen2_test.go b/internal/gen/bitfield/gen2_test.go index ad5f72aab..fc79de032 100644 --- a/internal/gen/bitfield/gen2_test.go +++ b/internal/gen/bitfield/gen2_test.go @@ -1,4 +1,4 @@ -// Code generated by golang.org/x/text/internal/gen/bitfield. DO NOT EDIT. +// Code generated by github.com/liquid-dev/text/internal/gen/bitfield. DO NOT EDIT. package bitfield diff --git a/internal/gen/gen.go b/internal/gen/gen.go index 8e79750f7..cc618ab0a 100644 --- a/internal/gen/gen.go +++ b/internal/gen/gen.go @@ -69,7 +69,7 @@ func Init() { flag.Parse() } -const header = `// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +const header = `// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. ` @@ -179,10 +179,10 @@ func getLocalDir() string { return dir } -const readmeTxt = `Generated by golang.org/x/text/internal/gen. DO NOT EDIT. +const readmeTxt = `Generated by github.com/liquid-dev/text/internal/gen. DO NOT EDIT. This directory contains downloaded files used to generate the various tables -in the golang.org/x/text subrepo. +in the github.com/liquid-dev/text subrepo. Note that the language subtag repo (iana/assignments/language-subtag-registry) and all other times in the iana subdirectory are not versioned and will need diff --git a/internal/language/common.go b/internal/language/common.go index cdfdb7497..38fb2de87 100644 --- a/internal/language/common.go +++ b/internal/language/common.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package language diff --git a/internal/language/compact/parents.go b/internal/language/compact/parents.go index 8d810723c..6910955ac 100644 --- a/internal/language/compact/parents.go +++ b/internal/language/compact/parents.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package compact diff --git a/internal/language/compact/tables.go b/internal/language/compact/tables.go index d2cde9f94..f8fff7c0c 100644 --- a/internal/language/compact/tables.go +++ b/internal/language/compact/tables.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package compact diff --git a/internal/language/tables.go b/internal/language/tables.go index 9de01ffb9..ba53d5a16 100644 --- a/internal/language/tables.go +++ b/internal/language/tables.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package language diff --git a/internal/number/common.go b/internal/number/common.go index 0f7df193c..9f471558e 100644 --- a/internal/number/common.go +++ b/internal/number/common.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package number diff --git a/internal/number/tables.go b/internal/number/tables.go index c22660695..382a37535 100644 --- a/internal/number/tables.go +++ b/internal/number/tables.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package number diff --git a/language/display/tables.go b/language/display/tables.go index be0fcdc0b..6f99aca10 100644 --- a/language/display/tables.go +++ b/language/display/tables.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package display diff --git a/language/tables.go b/language/tables.go index e22807719..52a1d84b3 100644 --- a/language/tables.go +++ b/language/tables.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package language diff --git a/message/doc.go b/message/doc.go index 72e8fde71..16a9f8d14 100644 --- a/message/doc.go +++ b/message/doc.go @@ -63,7 +63,7 @@ // locales. The first step is to extract strings that need to be translated. // // 1. Install gotext -// go get -u golang.org/x/text/cmd/gotext +// go get -u github.com/liquid-dev/text/cmd/gotext // gotext -help // // 2. Mark strings in your source to be translated by using message.Printer, @@ -86,7 +86,7 @@ // // Right now this has to be done programmatically with calls to Set or // SetString. These functions as well as the methods defined in -// see also package golang.org/x/text/message/catalog can be used to implement +// see also package github.com/liquid-dev/text/message/catalog can be used to implement // either dynamic or static loading of messages. // // @@ -95,7 +95,7 @@ // Translated messages can vary based on the plural and gender forms of // substitution values. In general, it is up to the translators to provide // alternative translations for such forms. See the packages in -// golang.org/x/text/feature and golang.org/x/text/message/catalog for more +// github.com/liquid-dev/text/feature and github.com/liquid-dev/text/message/catalog for more // information. // package message diff --git a/message/pipeline/extract.go b/message/pipeline/extract.go index 8756ec719..3f4fc8505 100644 --- a/message/pipeline/extract.go +++ b/message/pipeline/extract.go @@ -103,7 +103,7 @@ func (x *extracter) globalData(pos token.Pos) *constData { func (x *extracter) seedEndpoints() error { pkgInfo := x.iprog.Package("github.com/liquid-dev/text/message") if pkgInfo == nil { - return errors.New("pipeline: golang.org/x/text/message is not imported") + return errors.New("pipeline: github.com/liquid-dev/text/message is not imported") } pkg := x.prog.Package(pkgInfo.Pkg) typ := types.NewPointer(pkg.Type("Printer").Type()) diff --git a/message/pipeline/pipeline_test.go b/message/pipeline/pipeline_test.go index e8ad395b0..fedfe4341 100644 --- a/message/pipeline/pipeline_test.go +++ b/message/pipeline/pipeline_test.go @@ -140,8 +140,8 @@ func initTestdataModule(t *testing.T, dst string) { goMod := fmt.Sprintf(`module testdata go 1.11 -require golang.org/x/text v0.0.0-00010101000000-000000000000 -replace golang.org/x/text v0.0.0-00010101000000-000000000000 => %s +require github.com/liquid-dev/text v0.0.0-00010101000000-000000000000 +replace github.com/liquid-dev/text v0.0.0-00010101000000-000000000000 => %s `, xTextDir) if err := ioutil.WriteFile(filepath.Join(dst, "go.mod"), []byte(goMod), 0644); err != nil { t.Fatal(err) diff --git a/message/pipeline/rewrite.go b/message/pipeline/rewrite.go index 2ec14f76e..c653534e9 100644 --- a/message/pipeline/rewrite.go +++ b/message/pipeline/rewrite.go @@ -243,7 +243,7 @@ type rewriteType struct { // rewriteFuncs list functions that can be directly mapped to the printer // functions of the message package. var rewriteFuncs = map[string]map[string]rewriteType{ - // TODO: Printer -> *golang.org/x/text/message.Printer + // TODO: Printer -> *github.com/liquid-dev/text/message.Printer "fmt": { "Print": rewriteType{methodf: "Printf"}, "Sprint": rewriteType{methodf: "Sprintf"}, diff --git a/message/pipeline/testdata/ssa/catalog_gen.go b/message/pipeline/testdata/ssa/catalog_gen.go index 1926fc33a..903829513 100644 --- a/message/pipeline/testdata/ssa/catalog_gen.go +++ b/message/pipeline/testdata/ssa/catalog_gen.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package main diff --git a/message/pipeline/testdata/test1/catalog_gen.go b/message/pipeline/testdata/test1/catalog_gen.go index 65a7fb2a6..e5e5752a3 100644 --- a/message/pipeline/testdata/test1/catalog_gen.go +++ b/message/pipeline/testdata/test1/catalog_gen.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package main diff --git a/message/pipeline/testdata/test1/catalog_gen.go.want b/message/pipeline/testdata/test1/catalog_gen.go.want index 890ef51ab..c4c679d8b 100644 --- a/message/pipeline/testdata/test1/catalog_gen.go.want +++ b/message/pipeline/testdata/test1/catalog_gen.go.want @@ -1,11 +1,11 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package main import ( - "golang.org/x/text/language" - "golang.org/x/text/message" - "golang.org/x/text/message/catalog" + "github.com/liquid-dev/text/language" + "github.com/liquid-dev/text/message" + "github.com/liquid-dev/text/message/catalog" ) type dictionary struct { diff --git a/search/tables.go b/search/tables.go index 72d27b5d4..2cb10d495 100644 --- a/search/tables.go +++ b/search/tables.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package search diff --git a/secure/precis/tables10.0.0.go b/secure/precis/tables10.0.0.go index 362d2729b..6f32caa2b 100644 --- a/secure/precis/tables10.0.0.go +++ b/secure/precis/tables10.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.10,!go1.13 diff --git a/secure/precis/tables11.0.0.go b/secure/precis/tables11.0.0.go index 0db5a9e7b..073ae6df7 100644 --- a/secure/precis/tables11.0.0.go +++ b/secure/precis/tables11.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.13,!go1.14 diff --git a/secure/precis/tables12.0.0.go b/secure/precis/tables12.0.0.go index 014e6bc2f..8f04e1477 100644 --- a/secure/precis/tables12.0.0.go +++ b/secure/precis/tables12.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.14 diff --git a/secure/precis/tables9.0.0.go b/secure/precis/tables9.0.0.go index dacaf6a4e..006ef65fa 100644 --- a/secure/precis/tables9.0.0.go +++ b/secure/precis/tables9.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build !go1.10 diff --git a/secure/precis/trieval.go b/secure/precis/trieval.go index 4833f9622..a723ea442 100644 --- a/secure/precis/trieval.go +++ b/secure/precis/trieval.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package precis diff --git a/unicode/bidi/ranges_test.go b/unicode/bidi/ranges_test.go index 06747e7de..2c485528d 100644 --- a/unicode/bidi/ranges_test.go +++ b/unicode/bidi/ranges_test.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package bidi diff --git a/unicode/bidi/tables10.0.0.go b/unicode/bidi/tables10.0.0.go index d8c94e1bd..be2735afe 100644 --- a/unicode/bidi/tables10.0.0.go +++ b/unicode/bidi/tables10.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.10,!go1.13 diff --git a/unicode/bidi/tables11.0.0.go b/unicode/bidi/tables11.0.0.go index 16b11db53..3477af559 100644 --- a/unicode/bidi/tables11.0.0.go +++ b/unicode/bidi/tables11.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.13,!go1.14 diff --git a/unicode/bidi/tables12.0.0.go b/unicode/bidi/tables12.0.0.go index 7ffa36512..fd3a9fb61 100644 --- a/unicode/bidi/tables12.0.0.go +++ b/unicode/bidi/tables12.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.14 diff --git a/unicode/bidi/tables9.0.0.go b/unicode/bidi/tables9.0.0.go index 0ca0193eb..a7cced627 100644 --- a/unicode/bidi/tables9.0.0.go +++ b/unicode/bidi/tables9.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build !go1.10 diff --git a/unicode/bidi/trieval.go b/unicode/bidi/trieval.go index 4c459c4b7..24053278d 100644 --- a/unicode/bidi/trieval.go +++ b/unicode/bidi/trieval.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package bidi diff --git a/unicode/cldr/xml.go b/unicode/cldr/xml.go index bbae53bd6..a79ad7587 100644 --- a/unicode/cldr/xml.go +++ b/unicode/cldr/xml.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package cldr diff --git a/unicode/doc.go b/unicode/doc.go index e8f1032d0..79ab8213e 100644 --- a/unicode/doc.go +++ b/unicode/doc.go @@ -3,6 +3,6 @@ // license that can be found in the LICENSE file. // unicode holds packages with implementations of Unicode standards that are -// mostly used as building blocks for other packages in golang.org/x/text, +// mostly used as building blocks for other packages in github.com/liquid-dev/text, // layout engines, or are otherwise more low-level in nature. package unicode diff --git a/unicode/norm/data10.0.0_test.go b/unicode/norm/data10.0.0_test.go index 56441e72f..d4edcc40c 100644 --- a/unicode/norm/data10.0.0_test.go +++ b/unicode/norm/data10.0.0_test.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.10,!go1.13 diff --git a/unicode/norm/data11.0.0_test.go b/unicode/norm/data11.0.0_test.go index ee8ec8b53..a1419431e 100644 --- a/unicode/norm/data11.0.0_test.go +++ b/unicode/norm/data11.0.0_test.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.13,!go1.14 diff --git a/unicode/norm/data12.0.0_test.go b/unicode/norm/data12.0.0_test.go index 9194440e3..168002d77 100644 --- a/unicode/norm/data12.0.0_test.go +++ b/unicode/norm/data12.0.0_test.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.14 diff --git a/unicode/norm/data9.0.0_test.go b/unicode/norm/data9.0.0_test.go index b1be64d55..ced000b16 100644 --- a/unicode/norm/data9.0.0_test.go +++ b/unicode/norm/data9.0.0_test.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build !go1.10 diff --git a/unicode/norm/tables10.0.0.go b/unicode/norm/tables10.0.0.go index 26fbd55a1..ec6eafcd2 100644 --- a/unicode/norm/tables10.0.0.go +++ b/unicode/norm/tables10.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.10,!go1.13 diff --git a/unicode/norm/tables11.0.0.go b/unicode/norm/tables11.0.0.go index 2c58f09ba..72abf542d 100644 --- a/unicode/norm/tables11.0.0.go +++ b/unicode/norm/tables11.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.13,!go1.14 diff --git a/unicode/norm/tables12.0.0.go b/unicode/norm/tables12.0.0.go index 10f5202c6..ba2d35258 100644 --- a/unicode/norm/tables12.0.0.go +++ b/unicode/norm/tables12.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.14 diff --git a/unicode/norm/tables9.0.0.go b/unicode/norm/tables9.0.0.go index 942906929..a6d3887c4 100644 --- a/unicode/norm/tables9.0.0.go +++ b/unicode/norm/tables9.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build !go1.10 diff --git a/unicode/rangetable/tables10.0.0.go b/unicode/rangetable/tables10.0.0.go index 3dfcd8293..e5d63c6fa 100644 --- a/unicode/rangetable/tables10.0.0.go +++ b/unicode/rangetable/tables10.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.10,!go1.13 diff --git a/unicode/rangetable/tables11.0.0.go b/unicode/rangetable/tables11.0.0.go index 1df829f06..c971eae22 100644 --- a/unicode/rangetable/tables11.0.0.go +++ b/unicode/rangetable/tables11.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.13,!go1.14 diff --git a/unicode/rangetable/tables12.0.0.go b/unicode/rangetable/tables12.0.0.go index 16dad246c..3edf8c7df 100644 --- a/unicode/rangetable/tables12.0.0.go +++ b/unicode/rangetable/tables12.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.14 diff --git a/unicode/rangetable/tables9.0.0.go b/unicode/rangetable/tables9.0.0.go index aef876d96..218bfb952 100644 --- a/unicode/rangetable/tables9.0.0.go +++ b/unicode/rangetable/tables9.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build !go1.10 diff --git a/unicode/runenames/tables10.0.0.go b/unicode/runenames/tables10.0.0.go index e74a21c2a..638a36bfd 100644 --- a/unicode/runenames/tables10.0.0.go +++ b/unicode/runenames/tables10.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.10,!go1.13 diff --git a/unicode/runenames/tables11.0.0.go b/unicode/runenames/tables11.0.0.go index 8b41b53b3..34562caa8 100644 --- a/unicode/runenames/tables11.0.0.go +++ b/unicode/runenames/tables11.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.13,!go1.14 diff --git a/unicode/runenames/tables12.0.0.go b/unicode/runenames/tables12.0.0.go index 246e17ece..dabc9fd30 100644 --- a/unicode/runenames/tables12.0.0.go +++ b/unicode/runenames/tables12.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.14 diff --git a/unicode/runenames/tables9.0.0.go b/unicode/runenames/tables9.0.0.go index 912c39613..982f1aa51 100644 --- a/unicode/runenames/tables9.0.0.go +++ b/unicode/runenames/tables9.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build !go1.10 diff --git a/width/common_test.go b/width/common_test.go index 57841a8ec..ff25866a8 100644 --- a/width/common_test.go +++ b/width/common_test.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package width diff --git a/width/runes_test.go b/width/runes_test.go index 587dab4ed..0c678b708 100644 --- a/width/runes_test.go +++ b/width/runes_test.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package width diff --git a/width/tables10.0.0.go b/width/tables10.0.0.go index decb8e480..88801a527 100644 --- a/width/tables10.0.0.go +++ b/width/tables10.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.10,!go1.13 diff --git a/width/tables11.0.0.go b/width/tables11.0.0.go index 3c75e428f..7bffbebe1 100644 --- a/width/tables11.0.0.go +++ b/width/tables11.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.13,!go1.14 diff --git a/width/tables12.0.0.go b/width/tables12.0.0.go index 5c859677a..e3601442c 100644 --- a/width/tables12.0.0.go +++ b/width/tables12.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build go1.14 diff --git a/width/tables9.0.0.go b/width/tables9.0.0.go index 7069e2634..54cb91c5f 100644 --- a/width/tables9.0.0.go +++ b/width/tables9.0.0.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. // +build !go1.10 diff --git a/width/trieval.go b/width/trieval.go index ca8e45fd1..04e0b5c93 100644 --- a/width/trieval.go +++ b/width/trieval.go @@ -1,4 +1,4 @@ -// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT. +// Code generated by running "go generate" in github.com/liquid-dev/text. DO NOT EDIT. package width diff --git a/width/width.go b/width/width.go index b1e882b5d..2f871f5dc 100644 --- a/width/width.go +++ b/width/width.go @@ -184,7 +184,7 @@ func (t Transformer) String(s string) string { var ( // Fold is a transform that maps all runes to their canonical width. // - // Note that the NFKC and NFKD transforms in golang.org/x/text/unicode/norm + // Note that the NFKC and NFKD transforms in github.com/liquid-dev/text/unicode/norm // provide a more generic folding mechanism. Fold Transformer = Transformer{foldTransform{}}