diff --git a/lang/en/LC_MESSAGES/default.po b/lang/en/LC_MESSAGES/default.po index 99311b4..cae96aa 100644 --- a/lang/en/LC_MESSAGES/default.po +++ b/lang/en/LC_MESSAGES/default.po @@ -55,8 +55,8 @@ msgstr "Safe Search On" msgid "save_settings" msgstr "Save settings" -msgid "page_title" -msgstr "Search results for '%s'" +msgid "all_settings" +msgstr "All settings" msgid "site_name" msgstr "Ocásek" diff --git a/lang/pl/LC_MESSAGES/default.po b/lang/pl/LC_MESSAGES/default.po index f60783a..a424815 100644 --- a/lang/pl/LC_MESSAGES/default.po +++ b/lang/pl/LC_MESSAGES/default.po @@ -55,8 +55,8 @@ msgstr "Włączony filtr" msgid "save_settings" msgstr "Zapisz ustawienia" -msgid "page_title" -msgstr "Wyniki wyszukiwania dla '%s'" +msgid "all_settings" +msgstr "Wszystkie ustawienia" msgid "site_name" msgstr "Ocásek" diff --git a/templates/files.html b/templates/files.html index 24d91c8..7e05993 100755 --- a/templates/files.html +++ b/templates/files.html @@ -6,7 +6,7 @@ {{ if .IsThemeDark }} {{ end }} - {{ translate "page_title" .Query }} + {{ .Query }} - {{ translate "site_name" }} diff --git a/templates/forums.html b/templates/forums.html index 67168d5..ceae89d 100755 --- a/templates/forums.html +++ b/templates/forums.html @@ -6,7 +6,7 @@ {{ if .IsThemeDark }} {{ end }} - {{ translate "page_title" .Query }} + {{ .Query }} - {{ translate "site_name" }} diff --git a/templates/images.html b/templates/images.html index e5a0849..b5d73f7 100755 --- a/templates/images.html +++ b/templates/images.html @@ -6,7 +6,7 @@ {{ if .IsThemeDark }} {{ end }} - {{ translate "page_title" .Query }} + {{ .Query }} - {{ translate "site_name" }} diff --git a/templates/map.html b/templates/map.html index 1cb3bd4..ecb61ac 100644 --- a/templates/map.html +++ b/templates/map.html @@ -6,7 +6,7 @@ {{ if .IsThemeDark }} {{ end }} - {{ translate "page_title" .Query }} + {{ translate "site_name" }} - {{ .Query }} diff --git a/templates/search.html b/templates/search.html index f40934d..1e644af 100755 --- a/templates/search.html +++ b/templates/search.html @@ -6,7 +6,7 @@ {{ if .IsThemeDark }} {{ end }} - {{ translate "search_page_title" }} + {{ translate "site_name" }} @@ -74,7 +74,7 @@
-

{{ translate "current_theme" }}: {{.Theme}}

+

{{ translate "theme" }}: {{.Theme}}

{{ translate
{{ translate
diff --git a/templates/text.html b/templates/text.html index 6bcf6d2..8f7645e 100755 --- a/templates/text.html +++ b/templates/text.html @@ -6,7 +6,7 @@ {{ if .IsThemeDark }} {{ end }} - {{ translate "page_title" .Query }} + {{ .Query }} - {{ translate "site_name" }} diff --git a/templates/videos.html b/templates/videos.html index 4c8b268..58625d4 100644 --- a/templates/videos.html +++ b/templates/videos.html @@ -6,7 +6,7 @@ {{ if .IsThemeDark }} {{ end }} - {{ translate "page_title" .Query }} + {{ .Query }} - {{ translate "site_name" }} diff --git a/text-google.go b/text-google.go index e3f788e..a706aff 100644 --- a/text-google.go +++ b/text-google.go @@ -65,25 +65,24 @@ func buildSearchURL(query, safe, lang string, page, resultsPerPage int) string { } langParam := "" - var glParam, uuleParam string + var glParam string if lang != "" { // Use lang as the geolocation langParam = "&lr=lang_" + lang glParam = "&gl=" + lang - uuleParam = "" } else { - // Use random geolocation - glParam, uuleParam = "us", "us" + // Use default geolocation + glParam = "&gl=us" } startIndex := (page - 1) * resultsPerPage - printDebug(fmt.Sprintf("https://www.google.com/search?q=%s%s%s%s%s&start=%d", - url.QueryEscape(query), safeParam, langParam, glParam, uuleParam, startIndex)) + printDebug(fmt.Sprintf("https://www.google.com/search?q=%s%s%s%s&start=%d", + url.QueryEscape(query), safeParam, langParam, glParam, startIndex)) - return fmt.Sprintf("https://www.google.com/search?q=%s%s%s%s%s&start=%d", - url.QueryEscape(query), safeParam, langParam, glParam, uuleParam, startIndex) + return fmt.Sprintf("https://www.google.com/search?q=%s%s%s%s&start=%d", + url.QueryEscape(query), safeParam, langParam, glParam, startIndex) } // func getRandomGeoLocation() (string, string) {