summaryrefslogtreecommitdiffstats
path: root/vendor
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-06-02 16:47:26 -0300
committerCorey Hulen <corey@hulen.com>2016-06-02 12:47:26 -0700
commit159953050a9c4fb700bbde79042ead4843b0bea5 (patch)
tree747a022c5cf579599402447b5e5d0f51dfee9f76 /vendor
parente44b8ec6d57fc55230a5c97ea105b7fd9ef59aca (diff)
downloadchat-159953050a9c4fb700bbde79042ead4843b0bea5.tar.gz
chat-159953050a9c4fb700bbde79042ead4843b0bea5.tar.bz2
chat-159953050a9c4fb700bbde79042ead4843b0bea5.zip
PLT-1800 Load server side locale from the config.json (#3202)
* PLT-1800 Load server side locale from the config.json * Add support for locales with country specifics * Fix localization on served locale file as plain/text * Remove github.com/cloudfoundry/jibber_jabber as vendor dependency * Fix get locale on login_controller
Diffstat (limited to 'vendor')
-rw-r--r--vendor/github.com/cloudfoundry/jibber_jabber/.travis.yml11
-rw-r--r--vendor/github.com/cloudfoundry/jibber_jabber/LICENSE201
-rw-r--r--vendor/github.com/cloudfoundry/jibber_jabber/README.md44
-rwxr-xr-xvendor/github.com/cloudfoundry/jibber_jabber/ci/scripts/windows-64-test.bat5
-rw-r--r--vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber.go22
-rw-r--r--vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber_suite_test.go13
-rw-r--r--vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber_unix.go57
-rw-r--r--vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber_unix_test.go104
-rw-r--r--vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber_windows.go114
-rw-r--r--vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber_windows_test.go51
10 files changed, 0 insertions, 622 deletions
diff --git a/vendor/github.com/cloudfoundry/jibber_jabber/.travis.yml b/vendor/github.com/cloudfoundry/jibber_jabber/.travis.yml
deleted file mode 100644
index b19c2e535..000000000
--- a/vendor/github.com/cloudfoundry/jibber_jabber/.travis.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-language: go
-go:
- - 1.2
-before_install:
-- go get github.com/onsi/ginkgo/...
-- go get github.com/onsi/gomega/...
-- go install github.com/onsi/ginkgo/ginkgo
-script: PATH=$PATH:$HOME/gopath/bin ginkgo -r .
-branches:
- only:
- - master
diff --git a/vendor/github.com/cloudfoundry/jibber_jabber/LICENSE b/vendor/github.com/cloudfoundry/jibber_jabber/LICENSE
deleted file mode 100644
index 915b20892..000000000
--- a/vendor/github.com/cloudfoundry/jibber_jabber/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
-Copyright 2014 Pivotal
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/vendor/github.com/cloudfoundry/jibber_jabber/README.md b/vendor/github.com/cloudfoundry/jibber_jabber/README.md
deleted file mode 100644
index d696eb6b6..000000000
--- a/vendor/github.com/cloudfoundry/jibber_jabber/README.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# Jibber Jabber [![Build Status](https://travis-ci.org/cloudfoundry/jibber_jabber.svg?branch=master)](https://travis-ci.org/cloudfoundry/jibber_jabber)
-Jibber Jabber is a GoLang Library that can be used to detect an operating system's current language.
-
-### OS Support
-
-OSX and Linux via the `LC_ALL` and `LANG` environment variables. These are standard variables that are used in ALL versions of UNIX for language detection.
-
-Windows via [GetUserDefaultLocaleName](http://msdn.microsoft.com/en-us/library/windows/desktop/dd318136.aspx) and [GetSystemDefaultLocaleName](http://msdn.microsoft.com/en-us/library/windows/desktop/dd318122.aspx) system calls. These calls are supported in Windows Vista and up.
-
-# Usage
-Add the following line to your go `import`:
-
-```
- "github.com/cloudfoundry/jibber_jabber"
-```
-
-### DetectIETF
-`DetectIETF` will return the current locale as a string. The format of the locale will be the [ISO 639](http://en.wikipedia.org/wiki/ISO_639) two-letter language code, a DASH, then an [ISO 3166](http://en.wikipedia.org/wiki/ISO_3166-1) two-letter country code.
-
-```
- userLocale, err := jibber_jabber.DetectIETF()
- println("Locale:", userLocale)
-```
-
-### DetectLanguage
-`DetectLanguage` will return the current languge as a string. The format will be the [ISO 639](http://en.wikipedia.org/wiki/ISO_639) two-letter language code.
-
-```
- userLanguage, err := jibber_jabber.DetectLanguage()
- println("Language:", userLanguage)
-```
-
-### DetectTerritory
-`DetectTerritory` will return the current locale territory as a string. The format will be the [ISO 3166](http://en.wikipedia.org/wiki/ISO_3166-1) two-letter country code.
-
-```
- localeTerritory, err := jibber_jabber.DetectTerritory()
- println("Territory:", localeTerritory)
-```
-
-### Errors
-All the Detect commands will return an error if they are unable to read the Locale from the system.
-
-For Windows, additional error information is provided due to the nature of the system call being used.
diff --git a/vendor/github.com/cloudfoundry/jibber_jabber/ci/scripts/windows-64-test.bat b/vendor/github.com/cloudfoundry/jibber_jabber/ci/scripts/windows-64-test.bat
deleted file mode 100755
index b9a87bf7a..000000000
--- a/vendor/github.com/cloudfoundry/jibber_jabber/ci/scripts/windows-64-test.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-git fetch
-git checkout %GIT_COMMIT%
-
-SET GOPATH=%CD%\Godeps\_workspace;c:\Users\Administrator\go
-c:\Go\bin\go test -v .
diff --git a/vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber.go b/vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber.go
deleted file mode 100644
index 45d288ea8..000000000
--- a/vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package jibber_jabber
-
-import (
- "strings"
-)
-
-const (
- COULD_NOT_DETECT_PACKAGE_ERROR_MESSAGE = "Could not detect Language"
-)
-
-func splitLocale(locale string) (string, string) {
- formattedLocale := strings.Split(locale, ".")[0]
- formattedLocale = strings.Replace(formattedLocale, "-", "_", -1)
-
- pieces := strings.Split(formattedLocale, "_")
- language := pieces[0]
- territory := ""
- if len(pieces) > 1 {
- territory = strings.Split(formattedLocale, "_")[1]
- }
- return language, territory
-}
diff --git a/vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber_suite_test.go b/vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber_suite_test.go
deleted file mode 100644
index 3da19c84b..000000000
--- a/vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber_suite_test.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package jibber_jabber_test
-
-import (
- . "github.com/onsi/ginkgo"
- . "github.com/onsi/gomega"
-
- "testing"
-)
-
-func TestJibberJabber(t *testing.T) {
- RegisterFailHandler(Fail)
- RunSpecs(t, "Jibber Jabber Suite")
-}
diff --git a/vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber_unix.go b/vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber_unix.go
deleted file mode 100644
index 374d76176..000000000
--- a/vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber_unix.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// +build darwin freebsd linux netbsd openbsd
-
-package jibber_jabber
-
-import (
- "errors"
- "os"
- "strings"
-)
-
-func getLangFromEnv() (locale string) {
- locale = os.Getenv("LC_ALL")
- if locale == "" {
- locale = os.Getenv("LANG")
- }
- return
-}
-
-func getUnixLocale() (unix_locale string, err error) {
- unix_locale = getLangFromEnv()
- if unix_locale == "" {
- err = errors.New(COULD_NOT_DETECT_PACKAGE_ERROR_MESSAGE)
- }
-
- return
-}
-
-func DetectIETF() (locale string, err error) {
- unix_locale, err := getUnixLocale()
- if err == nil {
- language, territory := splitLocale(unix_locale)
- locale = language
- if territory != "" {
- locale = strings.Join([]string{language, territory}, "-")
- }
- }
-
- return
-}
-
-func DetectLanguage() (language string, err error) {
- unix_locale, err := getUnixLocale()
- if err == nil {
- language, _ = splitLocale(unix_locale)
- }
-
- return
-}
-
-func DetectTerritory() (territory string, err error) {
- unix_locale, err := getUnixLocale()
- if err == nil {
- _, territory = splitLocale(unix_locale)
- }
-
- return
-}
diff --git a/vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber_unix_test.go b/vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber_unix_test.go
deleted file mode 100644
index a5e3074a2..000000000
--- a/vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber_unix_test.go
+++ /dev/null
@@ -1,104 +0,0 @@
-// +build darwin freebsd linux netbsd openbsd
-
-package jibber_jabber_test
-
-import (
- "os"
-
- . "github.com/cloudfoundry/jibber_jabber"
-
- . "github.com/onsi/ginkgo"
- . "github.com/onsi/gomega"
-)
-
-var _ = Describe("Unix", func() {
- AfterEach(func() {
- os.Setenv("LC_ALL", "")
- os.Setenv("LANG", "en_US.UTF-8")
- })
-
- Describe("#DetectIETF", func() {
- Context("Returns IETF encoded locale", func() {
- It("should return the locale set to LC_ALL", func() {
- os.Setenv("LC_ALL", "fr_FR.UTF-8")
- result, _ := DetectIETF()
- Ω(result).Should(Equal("fr-FR"))
- })
-
- It("should return the locale set to LANG if LC_ALL isn't set", func() {
- os.Setenv("LANG", "fr_FR.UTF-8")
-
- result, _ := DetectIETF()
- Ω(result).Should(Equal("fr-FR"))
- })
-
- It("should return an error if it cannot detect a locale", func() {
- os.Setenv("LANG", "")
-
- _, err := DetectIETF()
- Ω(err.Error()).Should(Equal(COULD_NOT_DETECT_PACKAGE_ERROR_MESSAGE))
- })
- })
-
- Context("when the locale is simply 'fr'", func() {
- BeforeEach(func() {
- os.Setenv("LANG", "fr")
- })
-
- It("should return the locale without a territory", func() {
- language, err := DetectIETF()
- Ω(err).ShouldNot(HaveOccurred())
- Ω(language).Should(Equal("fr"))
- })
- })
- })
-
- Describe("#DetectLanguage", func() {
- Context("Returns encoded language", func() {
- It("should return the language set to LC_ALL", func() {
- os.Setenv("LC_ALL", "fr_FR.UTF-8")
- result, _ := DetectLanguage()
- Ω(result).Should(Equal("fr"))
- })
-
- It("should return the language set to LANG if LC_ALL isn't set", func() {
- os.Setenv("LANG", "fr_FR.UTF-8")
-
- result, _ := DetectLanguage()
- Ω(result).Should(Equal("fr"))
- })
-
- It("should return an error if it cannot detect a language", func() {
- os.Setenv("LANG", "")
-
- _, err := DetectLanguage()
- Ω(err.Error()).Should(Equal(COULD_NOT_DETECT_PACKAGE_ERROR_MESSAGE))
- })
- })
- })
-
- Describe("#DetectTerritory", func() {
- Context("Returns encoded territory", func() {
- It("should return the territory set to LC_ALL", func() {
- os.Setenv("LC_ALL", "fr_FR.UTF-8")
- result, _ := DetectTerritory()
- Ω(result).Should(Equal("FR"))
- })
-
- It("should return the territory set to LANG if LC_ALL isn't set", func() {
- os.Setenv("LANG", "fr_FR.UTF-8")
-
- result, _ := DetectTerritory()
- Ω(result).Should(Equal("FR"))
- })
-
- It("should return an error if it cannot detect a territory", func() {
- os.Setenv("LANG", "")
-
- _, err := DetectTerritory()
- Ω(err.Error()).Should(Equal(COULD_NOT_DETECT_PACKAGE_ERROR_MESSAGE))
- })
- })
- })
-
-})
diff --git a/vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber_windows.go b/vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber_windows.go
deleted file mode 100644
index 1acd96c38..000000000
--- a/vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber_windows.go
+++ /dev/null
@@ -1,114 +0,0 @@
-// +build windows
-
-package jibber_jabber
-
-import (
- "errors"
- "syscall"
- "unsafe"
-)
-
-const LOCALE_NAME_MAX_LENGTH uint32 = 85
-
-var SUPPORTED_LOCALES = map[uintptr]string{
- 0x0407: "de-DE",
- 0x0409: "en-US",
- 0x0c0a: "es-ES", //or is it 0x040a
- 0x040c: "fr-FR",
- 0x0410: "it-IT",
- 0x0411: "ja-JA",
- 0x0412: "ko_KR",
- 0x0416: "pt-BR",
- //0x0419: "ru_RU", - Will add support for Russian when nicksnyder/go-i18n supports Russian
- 0x0804: "zh-CN",
- 0x0c04: "zh-HK",
- 0x0404: "zh-TW",
-}
-
-func getWindowsLocaleFrom(sysCall string) (locale string, err error) {
- buffer := make([]uint16, LOCALE_NAME_MAX_LENGTH)
-
- dll := syscall.MustLoadDLL("kernel32")
- proc := dll.MustFindProc(sysCall)
- r, _, dllError := proc.Call(uintptr(unsafe.Pointer(&buffer[0])), uintptr(LOCALE_NAME_MAX_LENGTH))
- if r == 0 {
- err = errors.New(COULD_NOT_DETECT_PACKAGE_ERROR_MESSAGE + ":\n" + dllError.Error())
- return
- }
-
- locale = syscall.UTF16ToString(buffer)
-
- return
-}
-
-func getAllWindowsLocaleFrom(sysCall string) (string, error) {
- dll, err := syscall.LoadDLL("kernel32")
- if err != nil {
- return "", errors.New("Could not find kernel32 dll")
- }
-
- proc, err := dll.FindProc(sysCall)
- if err != nil {
- return "", err
- }
-
- locale, _, dllError := proc.Call()
- if locale == 0 {
- return "", errors.New(COULD_NOT_DETECT_PACKAGE_ERROR_MESSAGE + ":\n" + dllError.Error())
- }
-
- return SUPPORTED_LOCALES[locale], nil
-}
-
-func getWindowsLocale() (locale string, err error) {
- dll, err := syscall.LoadDLL("kernel32")
- if err != nil {
- return "", errors.New("Could not find kernel32 dll")
- }
-
- proc, err := dll.FindProc("GetVersion")
- if err != nil {
- return "", err
- }
-
- v, _, _ := proc.Call()
- windowsVersion := byte(v)
- isVistaOrGreater := (windowsVersion >= 6)
-
- if isVistaOrGreater {
- locale, err = getWindowsLocaleFrom("GetUserDefaultLocaleName")
- if err != nil {
- locale, err = getWindowsLocaleFrom("GetSystemDefaultLocaleName")
- }
- } else if !isVistaOrGreater {
- locale, err = getAllWindowsLocaleFrom("GetUserDefaultLCID")
- if err != nil {
- locale, err = getAllWindowsLocaleFrom("GetSystemDefaultLCID")
- }
- } else {
- panic(v)
- }
- return
-}
-func DetectIETF() (locale string, err error) {
- locale, err = getWindowsLocale()
- return
-}
-
-func DetectLanguage() (language string, err error) {
- windows_locale, err := getWindowsLocale()
- if err == nil {
- language, _ = splitLocale(windows_locale)
- }
-
- return
-}
-
-func DetectTerritory() (territory string, err error) {
- windows_locale, err := getWindowsLocale()
- if err == nil {
- _, territory = splitLocale(windows_locale)
- }
-
- return
-}
diff --git a/vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber_windows_test.go b/vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber_windows_test.go
deleted file mode 100644
index f325d981e..000000000
--- a/vendor/github.com/cloudfoundry/jibber_jabber/jibber_jabber_windows_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// +build windows
-
-package jibber_jabber_test
-
-import (
- "regexp"
-
- . "github.com/cloudfoundry/jibber_jabber"
-
- . "github.com/onsi/ginkgo"
- . "github.com/onsi/gomega"
-)
-
-const (
- LOCALE_REGEXP = "^[a-z]{2}-[A-Z]{2}$"
- LANGUAGE_REGEXP = "^[a-z]{2}$"
- TERRITORY_REGEXP = "^[A-Z]{2}$"
-)
-
-var _ = Describe("Windows", func() {
- BeforeEach(func() {
- locale, err := DetectIETF()
- Ω(err).Should(BeNil())
- Ω(locale).ShouldNot(BeNil())
- Ω(locale).ShouldNot(Equal(""))
- })
-
- Describe("#DetectIETF", func() {
- It("detects correct IETF locale", func() {
- locale, _ := DetectIETF()
- matched, _ := regexp.MatchString(LOCALE_REGEXP, locale)
- Ω(matched).Should(BeTrue())
- })
- })
-
- Describe("#DetectLanguage", func() {
- It("detects correct Language", func() {
- language, _ := DetectLanguage()
- matched, _ := regexp.MatchString(LANGUAGE_REGEXP, language)
- Ω(matched).Should(BeTrue())
- })
- })
-
- Describe("#DetectTerritory", func() {
- It("detects correct Territory", func() {
- territory, _ := DetectTerritory()
- matched, _ := regexp.MatchString(TERRITORY_REGEXP, territory)
- Ω(matched).Should(BeTrue())
- })
- })
-})