interface change

Marko Tikvić
1 parent 3712c373f9
Showing 1 changed file with 5 additions and 7 deletions Show diff stats
localization.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"io/ioutil"
-	"net/http"
 	"strings"
 	"sync"
 )
@@ -72,20 +71,19 @@ func (d *Dictionary) GetDefaultLocale() string {
 	return d.defaultLocale
 }
  
-func (d *Dictionary) GetBestMatchLocale(req *http.Request) (best string) {
-	accepted := d.parseAcceptedLanguageHeader(req)
+func (d *Dictionary) GetBestMatchLocale(acceptedLanguages string) (best string) {
+	accepted := d.parseAcceptedLanguageHeader(acceptedLanguages)
 	best = accepted[0]
 	return
 }
  
-func (d *Dictionary) parseAcceptedLanguageHeader(req *http.Request) (langs []string) {
-	a := req.Header.Get("Accepted-Language")
-	if a == "" {
+func (d *Dictionary) parseAcceptedLanguageHeader(acceptedLanguages string) (langs []string) {
+	if acceptedLanguages == "" {
 		langs = append(langs, d.GetDefaultLocale())
 		return
 	}
  
-	parts := strings.Split(a, ",")
+	parts := strings.Split(acceptedLanguages, ",")
 	for _, p := range parts {
 		langs = append(langs, p)
 	}
...	...	@@ -4,7 +4,6 @@ import (
4	4	"encoding/json"
5	5	"errors"
6	6	"io/ioutil"
7		- "net/http"
8	7	"strings"
9	8	"sync"
10	9	)
...	...	@@ -72,20 +71,19 @@ func (d *Dictionary) GetDefaultLocale() string {
72	71	return d.defaultLocale
73	72	}
74	73
75		-func (d Dictionary) GetBestMatchLocale(req http.Request) (best string) {
76		- accepted := d.parseAcceptedLanguageHeader(req)
	74	+func (d *Dictionary) GetBestMatchLocale(acceptedLanguages string) (best string) {
	75	+ accepted := d.parseAcceptedLanguageHeader(acceptedLanguages)
77	76	best = accepted[0]
78	77	return
79	78	}
80	79
81		-func (d Dictionary) parseAcceptedLanguageHeader(req http.Request) (langs []string) {
82		- a := req.Header.Get("Accepted-Language")
83		- if a == "" {
	80	+func (d *Dictionary) parseAcceptedLanguageHeader(acceptedLanguages string) (langs []string) {
	81	+ if acceptedLanguages == "" {
84	82	langs = append(langs, d.GetDefaultLocale())
85	83	return
86	84	}
87	85
88		- parts := strings.Split(a, ",")
	86	+ parts := strings.Split(acceptedLanguages, ",")
89	87	for _, p := range parts {
90	88	langs = append(langs, p)
91	89	}
...	...