v2 only (#176)

fixes #172
nicksnyder · May 19, 2019 · be3966f · be3966f · Jibec · Jun 2, 2020
1 parent 3c6ee90
commit be3966f
Show file tree

Hide file tree

Showing 121 changed files with 932 additions and 7,687 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -4,13 +4,5 @@ coverage:
       default:
         threshold: 50%
     project:
-      default: false
-      v1:
-        threshold: 0.1%
-        paths:
-          - i18n
-          - goi18n
-      v2:
+      default:
         threshold: 0.1%
-        paths:
-          - v2
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,7 @@ output/
 *.test
 *.swp
 
-v2/example/example
-v2/goi18n/goi18n
+example/example
+goi18n/goi18n
 
 dist/
diff --git a/v2/.goreleaser.yml → .goreleaser.yml b/v2/.goreleaser.yml → .goreleaser.yml
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,6 @@ language: go
 
 matrix:
   include:
-    - go: 1.2.x
-      env: PKG='./i18n/... ./goi18n/...'
     - go: 1.9.x
       env: PKG='./...'
     - go: 1.12.x

diff --git a/dev.md b/dev.md
@@ -4,5 +4,5 @@
 
 1.  Go to http://cldr.unicode.org/index/downloads to find the latest version.
 1.  Download the latest version of cldr-common (e.g. http://unicode.org/Public/cldr/33/cldr-common-33.0.zip)
-1.  Unzip and copy `common/supplemental/plurals.xml` to `v2/i18n/internal/plural/codegen/plurals.xml`
-1.  Run `generate.sh` in `v2/i18n/internal/plural/codegen/`
+1.  Unzip and copy `common/supplemental/plurals.xml` to `i18n/internal/plural/codegen/plurals.xml`
+1.  Run `generate.sh` in `i18n/internal/plural/codegen/`
diff --git a/v2/example/README.md → example/README.md b/v2/example/README.md → example/README.md
diff --git a/v2/example/active.en.toml → example/active.en.toml b/v2/example/active.en.toml → example/active.en.toml
diff --git a/v2/example/active.es.toml → example/active.es.toml b/v2/example/active.es.toml → example/active.es.toml
diff --git a/v2/example/main.go → example/main.go b/v2/example/main.go → example/main.go
diff --git a/go.mod b/go.mod
@@ -1,6 +1,11 @@
-module github.com/nicksnyder/go-i18n
+module github.com/nicksnyder/go-i18n/v2
 
 require (
-	github.com/pelletier/go-toml v1.2.0
+	github.com/BurntSushi/toml v0.3.0
+	golang.org/x/crypto v0.0.0-20190506204251-e1dfcc566284 // indirect
+	golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c // indirect
+	golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b // indirect
+	golang.org/x/text v0.3.2
+	golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c // indirect
 	gopkg.in/yaml.v2 v2.2.1
 )
diff --git a/v2/go.sum → go.sum b/v2/go.sum → go.sum
diff --git a/v2/goi18n/active.en.toml → goi18n/active.en.toml b/v2/goi18n/active.en.toml → goi18n/active.en.toml
diff --git a/v2/goi18n/common_test.go → goi18n/common_test.go b/v2/goi18n/common_test.go → goi18n/common_test.go
diff --git a/goi18n/constants_command.go b/goi18n/constants_command.go
diff --git a/goi18n/constants_command_test.go b/goi18n/constants_command_test.go