Archives
/
whoogle-search
mirror of https://github.com/benbusby/whoogle-search
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use 'gl' search param to set country

Browse Source 
This switches the param used for the "country" config setting from "cr"
(which only filters results by the country the result is hosted in) to
"gl" (which overrides server/hosting location and produces results that
are more accurate for the user's current country).

Before this change, the country config setting was (imo) pretty useless.
Allowing a user to override an instance's hosting location with their
preferred country though is way more useful, especially for public
instances that are hosted in a different country than the user.

Closes #544
pull/555/head
Ben Busby 3 years ago
parent 1d3e7c0255
commit 3c06519130
No known key found for this signature in database
GPG Key ID: 339B7B7EB5333D14
5 changed files with 260 additions and 278 deletions
Show Stats Download Patch File Download Diff File

2
app/models/config.py
Unescape Escape View File

@ -17,7 +17,7 @@ class Config:
self.block = os.getenv('WHOOGLE_CONFIG_BLOCK', '') self.block = os.getenv('WHOOGLE_CONFIG_BLOCK', '')
self.block_title = os.getenv('WHOOGLE_CONFIG_BLOCK_TITLE', '') self.block_title = os.getenv('WHOOGLE_CONFIG_BLOCK_TITLE', '')
self.block_url = os.getenv('WHOOGLE_CONFIG_BLOCK_URL', '') self.block_url = os.getenv('WHOOGLE_CONFIG_BLOCK_URL', '')
self.ctry = os.getenv('WHOOGLE_CONFIG_COUNTRY', '') self.ctry = os.getenv('WHOOGLE_CONFIG_COUNTRY', 'US')
self.theme = os.getenv('WHOOGLE_CONFIG_THEME', 'system') self.theme = os.getenv('WHOOGLE_CONFIG_THEME', 'system')
self.safe = read_config_bool('WHOOGLE_CONFIG_SAFE') self.safe = read_config_bool('WHOOGLE_CONFIG_SAFE')
self.dark = read_config_bool('WHOOGLE_CONFIG_DARK') # deprecated self.dark = read_config_bool('WHOOGLE_CONFIG_DARK') # deprecated

2
app/request.py
Unescape Escape View File

@ -120,7 +120,7 @@ def gen_query(query, args, config, near_city=None) -> str:
if 'chips' in args: if 'chips' in args:
param_dict['chips'] = '&chips=' + args.get('chips') param_dict['chips'] = '&chips=' + args.get('chips')
param_dict['cr'] = ('&cr=' + config.ctry) if config.ctry else '' param_dict['gl'] = ('&gl=' + config.ctry) if config.ctry else ''
param_dict['hl'] = '&hl=' + ( param_dict['hl'] = '&hl=' + (
config.lang_interface.replace('lang_', '') config.lang_interface.replace('lang_', '')
if config.lang_interface else '' if config.lang_interface else ''

485
app/static/settings/countries.json
Unescape Escape View File

@ -1,248 +1,247 @@
[ [
{"name": "-------", "value": ""}, {"name": "-------", "value": ""},
{"name": "Afghanistan", "value": "countryAF"}, {"name": "Afghanistan", "value": "AF"},
{"name": "Albania", "value": "countryAL"}, {"name": "Albania", "value": "AL"},
{"name": "Algeria", "value": "countryDZ"}, {"name": "Algeria", "value": "DZ"},
{"name": "American Samoa", "value": "countryAS"}, {"name": "American Samoa", "value": "AS"},
{"name": "Andorra", "value": "countryAD"}, {"name": "Andorra", "value": "AD"},
{"name": "Angola", "value": "countryAO"}, {"name": "Angola", "value": "AO"},
{"name": "Anguilla", "value": "countryAI"}, {"name": "Anguilla", "value": "AI"},
{"name": "Antarctica", "value": "countryAQ"}, {"name": "Antarctica", "value": "AQ"},
{"name": "Antigua and Barbuda", "value": "countryAG"}, {"name": "Antigua and Barbuda", "value": "AG"},
{"name": "Argentina", "value": "countryAR"}, {"name": "Argentina", "value": "AR"},
{"name": "Armenia", "value": "countryAM"}, {"name": "Armenia", "value": "AM"},
{"name": "Aruba", "value": "countryAW"}, {"name": "Aruba", "value": "AW"},
{"name": "Australia", "value": "countryAU"}, {"name": "Australia", "value": "AU"},
{"name": "Austria", "value": "countryAT"}, {"name": "Austria", "value": "AT"},
{"name": "Azerbaijan", "value": "countryAZ"}, {"name": "Azerbaijan", "value": "AZ"},
{"name": "Bahamas", "value": "countryBS"}, {"name": "Bahamas", "value": "BS"},
{"name": "Bahrain", "value": "countryBH"}, {"name": "Bahrain", "value": "BH"},
{"name": "Bangladesh", "value": "countryBD"}, {"name": "Bangladesh", "value": "BD"},
{"name": "Barbados", "value": "countryBB"}, {"name": "Barbados", "value": "BB"},
{"name": "Belarus", "value": "countryBY"}, {"name": "Belarus", "value": "BY"},
{"name": "Belgium", "value": "countryBE"}, {"name": "Belgium", "value": "BE"},
{"name": "Belize", "value": "countryBZ"}, {"name": "Belize", "value": "BZ"},
{"name": "Benin", "value": "countryBJ"}, {"name": "Benin", "value": "BJ"},
{"name": "Bermuda", "value": "countryBM"}, {"name": "Bermuda", "value": "BM"},
{"name": "Bhutan", "value": "countryBT"}, {"name": "Bhutan", "value": "BT"},
{"name": "Bolivia", "value": "countryBO"}, {"name": "Bolivia", "value": "BO"},
{"name": "Bosnia and Herzegovina", "value": "countryBA"}, {"name": "Bosnia and Herzegovina", "value": "BA"},
{"name": "Botswana", "value": "countryBW"}, {"name": "Botswana", "value": "BW"},
{"name": "Bouvet Island", "value": "countryBV"}, {"name": "Bouvet Island", "value": "BV"},
{"name": "Brazil", "value": "countryBR"}, {"name": "Brazil", "value": "BR"},
{"name": "British Indian Ocean Territory", "value": "countryIO"}, {"name": "British Indian Ocean Territory", "value": "IO"},
{"name": "Brunei Darussalam", "value": "countryBN"}, {"name": "Brunei Darussalam", "value": "BN"},
{"name": "Bulgaria", "value": "countryBG"}, {"name": "Bulgaria", "value": "BG"},
{"name": "Burkina Faso", "value": "countryBF"}, {"name": "Burkina Faso", "value": "BF"},
{"name": "Burundi", "value": "countryBI"}, {"name": "Burundi", "value": "BI"},
{"name": "Cambodia", "value": "countryKH"}, {"name": "Cambodia", "value": "KH"},
{"name": "Cameroon", "value": "countryCM"}, {"name": "Cameroon", "value": "CM"},
{"name": "Canada", "value": "countryCA"}, {"name": "Canada", "value": "CA"},
{"name": "Cape Verde", "value": "countryCV"}, {"name": "Cape Verde", "value": "CV"},
{"name": "Cayman Islands", "value": "countryKY"}, {"name": "Cayman Islands", "value": "KY"},
{"name": "Central African Republic", "value": "countryCF"}, {"name": "Central African Republic", "value": "CF"},
{"name": "Chad", "value": "countryTD"}, {"name": "Chad", "value": "TD"},
{"name": "Chile", "value": "countryCL"}, {"name": "Chile", "value": "CL"},
{"name": "China", "value": "countryCN"}, {"name": "China", "value": "CN"},
{"name": "Christmas Island", "value": "countryCX"}, {"name": "Christmas Island", "value": "CX"},
{"name": "Cocos (Keeling) Islands", "value": "countryCC"}, {"name": "Cocos (Keeling) Islands", "value": "CC"},
{"name": "Colombia", "value": "countryCO"}, {"name": "Colombia", "value": "CO"},
{"name": "Comoros", "value": "countryKM"}, {"name": "Comoros", "value": "KM"},
{"name": "Congo", "value": "countryCG"}, {"name": "Congo", "value": "CG"},
{"name": "Congo, Democratic Republic of the", "value": "countryCD"}, {"name": "Congo, Democratic Republic of the", "value": "CD"},
{"name": "Cook Islands", "value": "countryCK"}, {"name": "Cook Islands", "value": "CK"},
{"name": "Costa Rica", "value": "countryCR"}, {"name": "Costa Rica", "value": "CR"},
{"name": "Cote D\"ivoire", "value": "countryCI"}, {"name": "Cote D'ivoire", "value": "CI"},
{"name": "Croatia (Hrvatska)", "value": "countryHR"}, {"name": "Croatia (Hrvatska)", "value": "HR"},
{"name": "Cuba", "value": "countryCU"}, {"name": "Cuba", "value": "CU"},
{"name": "Cyprus", "value": "countryCY"}, {"name": "Cyprus", "value": "CY"},
{"name": "Czech Republic", "value": "countryCZ"}, {"name": "Czech Republic", "value": "CZ"},
{"name": "Denmark", "value": "countryDK"}, {"name": "Denmark", "value": "DK"},
{"name": "Djibouti", "value": "countryDJ"}, {"name": "Djibouti", "value": "DJ"},
{"name": "Dominica", "value": "countryDM"}, {"name": "Dominica", "value": "DM"},
{"name": "Dominican Republic", "value": "countryDO"}, {"name": "Dominican Republic", "value": "DO"},
{"name": "East Timor", "value": "countryTP"}, {"name": "East Timor", "value": "TP"},
{"name": "Ecuador", "value": "countryEC"}, {"name": "Ecuador", "value": "EC"},
{"name": "Egypt", "value": "countryEG"}, {"name": "Egypt", "value": "EG"},
{"name": "El Salvador", "value": "countrySV"}, {"name": "El Salvador", "value": "SV"},
{"name": "Equatorial Guinea", "value": "countryGQ"}, {"name": "Equatorial Guinea", "value": "GQ"},
{"name": "Eritrea", "value": "countryER"}, {"name": "Eritrea", "value": "ER"},
{"name": "Estonia", "value": "countryEE"}, {"name": "Estonia", "value": "EE"},
{"name": "Ethiopia", "value": "countryET"}, {"name": "Ethiopia", "value": "ET"},
{"name": "European Union", "value": "countryEU"}, {"name": "European Union", "value": "EU"},
{"name": "Falkland Islands (Malvinas)", "value": "countryFK"}, {"name": "Falkland Islands (Malvinas)", "value": "FK"},
{"name": "Faroe Islands", "value": "countryFO"}, {"name": "Faroe Islands", "value": "FO"},
{"name": "Fiji", "value": "countryFJ"}, {"name": "Fiji", "value": "FJ"},
{"name": "Finland", "value": "countryFI"}, {"name": "Finland", "value": "FI"},
{"name": "France", "value": "countryFR"}, {"name": "France", "value": "FR"},
{"name": "France, Metropolitan", "value": "countryFX"}, {"name": "France, Metropolitan", "value": "FX"},
{"name": "French Guiana", "value": "countryGF"}, {"name": "French Guiana", "value": "GF"},
{"name": "French Polynesia", "value": "countryPF"}, {"name": "French Polynesia", "value": "PF"},
{"name": "French Southern Territories", "value": "countryTF"}, {"name": "French Southern Territories", "value": "TF"},
{"name": "Gabon", "value": "countryGA"}, {"name": "Gabon", "value": "GA"},
{"name": "Gambia", "value": "countryGM"}, {"name": "Gambia", "value": "GM"},
{"name": "Georgia", "value": "countryGE"}, {"name": "Georgia", "value": "GE"},
{"name": "Germany", "value": "countryDE"}, {"name": "Germany", "value": "DE"},
{"name": "Ghana", "value": "countryGH"}, {"name": "Ghana", "value": "GH"},
{"name": "Gibraltar", "value": "countryGI"}, {"name": "Gibraltar", "value": "GI"},
{"name": "Greece", "value": "countryGR"}, {"name": "Greece", "value": "GR"},
{"name": "Greenland", "value": "countryGL"}, {"name": "Greenland", "value": "GL"},
{"name": "Grenada", "value": "countryGD"}, {"name": "Grenada", "value": "GD"},
{"name": "Guadeloupe", "value": "countryGP"}, {"name": "Guadeloupe", "value": "GP"},
{"name": "Guam", "value": "countryGU"}, {"name": "Guam", "value": "GU"},
{"name": "Guatemala", "value": "countryGT"}, {"name": "Guatemala", "value": "GT"},
{"name": "Guinea", "value": "countryGN"}, {"name": "Guinea", "value": "GN"},
{"name": "Guinea-Bissau", "value": "countryGW"}, {"name": "Guinea-Bissau", "value": "GW"},
{"name": "Guyana", "value": "countryGY"}, {"name": "Guyana", "value": "GY"},
{"name": "Haiti", "value": "countryHT"}, {"name": "Haiti", "value": "HT"},
{"name": "Heard Island and Mcdonald Islands", "value": "countryHM"}, {"name": "Heard Island and Mcdonald Islands", "value": "HM"},
{"name": "Holy See (Vatican City State)", "value": "countryVA"}, {"name": "Holy See (Vatican City State)", "value": "VA"},
{"name": "Honduras", "value": "countryHN"}, {"name": "Honduras", "value": "HN"},
{"name": "Hong Kong", "value": "countryHK"}, {"name": "Hong Kong", "value": "HK"},
{"name": "Hungary", "value": "countryHU"}, {"name": "Hungary", "value": "HU"},
{"name": "Iceland", "value": "countryIS"}, {"name": "Iceland", "value": "IS"},
{"name": "India", "value": "countryIN"}, {"name": "India", "value": "IN"},
{"name": "Indonesia", "value": "countryID"}, {"name": "Indonesia", "value": "ID"},
{"name": "Iran, Islamic Republic of", "value": "countryIR"}, {"name": "Iran, Islamic Republic of", "value": "IR"},
{"name": "Iraq", "value": "countryIQ"}, {"name": "Iraq", "value": "IQ"},
{"name": "Ireland", "value": "countryIE"}, {"name": "Ireland", "value": "IE"},
{"name": "Israel", "value": "countryIL"}, {"name": "Israel", "value": "IL"},
{"name": "Italy", "value": "countryIT"}, {"name": "Italy", "value": "IT"},
{"name": "Jamaica", "value": "countryJM"}, {"name": "Jamaica", "value": "JM"},
{"name": "Japan", "value": "countryJP"}, {"name": "Japan", "value": "JP"},
{"name": "Jordan", "value": "countryJO"}, {"name": "Jordan", "value": "JO"},
{"name": "Kazakhstan", "value": "countryKZ"}, {"name": "Kazakhstan", "value": "KZ"},
{"name": "Kenya", "value": "countryKE"}, {"name": "Kenya", "value": "KE"},
{"name": "Kiribati", "value": "countryKI"}, {"name": "Kiribati", "value": "KI"},
{"name": "Korea, Democratic People\"s Republic of", {"name": "Korea, Democratic People's Republic of", "value": "KP"},
"value": "countryKP"}, {"name": "Korea, Republic of", "value": "KR"},
{"name": "Korea, Republic of", "value": "countryKR"}, {"name": "Kuwait", "value": "KW"},
{"name": "Kuwait", "value": "countryKW"}, {"name": "Kyrgyzstan", "value": "KG"},
{"name": "Kyrgyzstan", "value": "countryKG"}, {"name": "Lao People's Democratic Republic", "value": "LA"},
{"name": "Lao People\"s Democratic Republic", "value": "countryLA"}, {"name": "Latvia", "value": "LV"},
{"name": "Latvia", "value": "countryLV"}, {"name": "Lebanon", "value": "LB"},
{"name": "Lebanon", "value": "countryLB"}, {"name": "Lesotho", "value": "LS"},
{"name": "Lesotho", "value": "countryLS"}, {"name": "Liberia", "value": "LR"},
{"name": "Liberia", "value": "countryLR"}, {"name": "Libyan Arab Jamahiriya", "value": "LY"},
{"name": "Libyan Arab Jamahiriya", "value": "countryLY"}, {"name": "Liechtenstein", "value": "LI"},
{"name": "Liechtenstein", "value": "countryLI"}, {"name": "Lithuania", "value": "LT"},
{"name": "Lithuania", "value": "countryLT"}, {"name": "Luxembourg", "value": "LU"},
{"name": "Luxembourg", "value": "countryLU"}, {"name": "Macao", "value": "MO"},
{"name": "Macao", "value": "countryMO"},
{"name": "Macedonia, the Former Yugosalv Republic of", {"name": "Macedonia, the Former Yugosalv Republic of",
"value": "countryMK"}, "value": "MK"},
{"name": "Madagascar", "value": "countryMG"}, {"name": "Madagascar", "value": "MG"},
{"name": "Malawi", "value": "countryMW"}, {"name": "Malawi", "value": "MW"},
{"name": "Malaysia", "value": "countryMY"}, {"name": "Malaysia", "value": "MY"},
{"name": "Maldives", "value": "countryMV"}, {"name": "Maldives", "value": "MV"},
{"name": "Mali", "value": "countryML"}, {"name": "Mali", "value": "ML"},
{"name": "Malta", "value": "countryMT"}, {"name": "Malta", "value": "MT"},
{"name": "Marshall Islands", "value": "countryMH"}, {"name": "Marshall Islands", "value": "MH"},
{"name": "Martinique", "value": "countryMQ"}, {"name": "Martinique", "value": "MQ"},
{"name": "Mauritania", "value": "countryMR"}, {"name": "Mauritania", "value": "MR"},
{"name": "Mauritius", "value": "countryMU"}, {"name": "Mauritius", "value": "MU"},
{"name": "Mayotte", "value": "countryYT"}, {"name": "Mayotte", "value": "YT"},
{"name": "Mexico", "value": "countryMX"}, {"name": "Mexico", "value": "MX"},
{"name": "Micronesia, Federated States of", "value": "countryFM"}, {"name": "Micronesia, Federated States of", "value": "FM"},
{"name": "Moldova, Republic of", "value": "countryMD"}, {"name": "Moldova, Republic of", "value": "MD"},
{"name": "Monaco", "value": "countryMC"}, {"name": "Monaco", "value": "MC"},
{"name": "Mongolia", "value": "countryMN"}, {"name": "Mongolia", "value": "MN"},
{"name": "Montserrat", "value": "countryMS"}, {"name": "Montserrat", "value": "MS"},
{"name": "Morocco", "value": "countryMA"}, {"name": "Morocco", "value": "MA"},
{"name": "Mozambique", "value": "countryMZ"}, {"name": "Mozambique", "value": "MZ"},
{"name": "Myanmar", "value": "countryMM"}, {"name": "Myanmar", "value": "MM"},
{"name": "Namibia", "value": "countryNA"}, {"name": "Namibia", "value": "NA"},
{"name": "Nauru", "value": "countryNR"}, {"name": "Nauru", "value": "NR"},
{"name": "Nepal", "value": "countryNP"}, {"name": "Nepal", "value": "NP"},
{"name": "Netherlands", "value": "countryNL"}, {"name": "Netherlands", "value": "NL"},
{"name": "Netherlands Antilles", "value": "countryAN"}, {"name": "Netherlands Antilles", "value": "AN"},
{"name": "New Caledonia", "value": "countryNC"}, {"name": "New Caledonia", "value": "NC"},
{"name": "New Zealand", "value": "countryNZ"}, {"name": "New Zealand", "value": "NZ"},
{"name": "Nicaragua", "value": "countryNI"}, {"name": "Nicaragua", "value": "NI"},
{"name": "Niger", "value": "countryNE"}, {"name": "Niger", "value": "NE"},
{"name": "Nigeria", "value": "countryNG"}, {"name": "Nigeria", "value": "NG"},
{"name": "Niue", "value": "countryNU"}, {"name": "Niue", "value": "NU"},
{"name": "Norfolk Island", "value": "countryNF"}, {"name": "Norfolk Island", "value": "NF"},
{"name": "Northern Mariana Islands", "value": "countryMP"}, {"name": "Northern Mariana Islands", "value": "MP"},
{"name": "Norway", "value": "countryNO"}, {"name": "Norway", "value": "NO"},
{"name": "Oman", "value": "countryOM"}, {"name": "Oman", "value": "OM"},
{"name": "Pakistan", "value": "countryPK"}, {"name": "Pakistan", "value": "PK"},
{"name": "Palau", "value": "countryPW"}, {"name": "Palau", "value": "PW"},
{"name": "Palestinian Territory", "value": "countryPS"}, {"name": "Palestinian Territory", "value": "PS"},
{"name": "Panama", "value": "countryPA"}, {"name": "Panama", "value": "PA"},
{"name": "Papua New Guinea", "value": "countryPG"}, {"name": "Papua New Guinea", "value": "PG"},
{"name": "Paraguay", "value": "countryPY"}, {"name": "Paraguay", "value": "PY"},
{"name": "Peru", "value": "countryPE"}, {"name": "Peru", "value": "PE"},
{"name": "Philippines", "value": "countryPH"}, {"name": "Philippines", "value": "PH"},
{"name": "Pitcairn", "value": "countryPN"}, {"name": "Pitcairn", "value": "PN"},
{"name": "Poland", "value": "countryPL"}, {"name": "Poland", "value": "PL"},
{"name": "Portugal", "value": "countryPT"}, {"name": "Portugal", "value": "PT"},
{"name": "Puerto Rico", "value": "countryPR"}, {"name": "Puerto Rico", "value": "PR"},
{"name": "Qatar", "value": "countryQA"}, {"name": "Qatar", "value": "QA"},
{"name": "Reunion", "value": "countryRE"}, {"name": "Reunion", "value": "RE"},
{"name": "Romania", "value": "countryRO"}, {"name": "Romania", "value": "RO"},
{"name": "Russian Federation", "value": "countryRU"}, {"name": "Russian Federation", "value": "RU"},
{"name": "Rwanda", "value": "countryRW"}, {"name": "Rwanda", "value": "RW"},
{"name": "Saint Helena", "value": "countrySH"}, {"name": "Saint Helena", "value": "SH"},
{"name": "Saint Kitts and Nevis", "value": "countryKN"}, {"name": "Saint Kitts and Nevis", "value": "KN"},
{"name": "Saint Lucia", "value": "countryLC"}, {"name": "Saint Lucia", "value": "LC"},
{"name": "Saint Pierre and Miquelon", "value": "countryPM"}, {"name": "Saint Pierre and Miquelon", "value": "PM"},
{"name": "Saint Vincent and the Grenadines", "value": "countryVC"}, {"name": "Saint Vincent and the Grenadines", "value": "VC"},
{"name": "Samoa", "value": "countryWS"}, {"name": "Samoa", "value": "WS"},
{"name": "San Marino", "value": "countrySM"}, {"name": "San Marino", "value": "SM"},
{"name": "Sao Tome and Principe", "value": "countryST"}, {"name": "Sao Tome and Principe", "value": "ST"},
{"name": "Saudi Arabia", "value": "countrySA"}, {"name": "Saudi Arabia", "value": "SA"},
{"name": "Senegal", "value": "countrySN"}, {"name": "Senegal", "value": "SN"},
{"name": "Serbia and Montenegro", "value": "countryCS"}, {"name": "Serbia and Montenegro", "value": "CS"},
{"name": "Seychelles", "value": "countrySC"}, {"name": "Seychelles", "value": "SC"},
{"name": "Sierra Leone", "value": "countrySL"}, {"name": "Sierra Leone", "value": "SL"},
{"name": "Singapore", "value": "countrySG"}, {"name": "Singapore", "value": "SG"},
{"name": "Slovakia", "value": "countrySK"}, {"name": "Slovakia", "value": "SK"},
{"name": "Slovenia", "value": "countrySI"}, {"name": "Slovenia", "value": "SI"},
{"name": "Solomon Islands", "value": "countrySB"}, {"name": "Solomon Islands", "value": "SB"},
{"name": "Somalia", "value": "countrySO"}, {"name": "Somalia", "value": "SO"},
{"name": "South Africa", "value": "countryZA"}, {"name": "South Africa", "value": "ZA"},
{"name": "South Georgia and the South Sandwich Islands", {"name": "South Georgia and the South Sandwich Islands",
"value": "countryGS"}, "value": "GS"},
{"name": "Spain", "value": "countryES"}, {"name": "Spain", "value": "ES"},
{"name": "Sri Lanka", "value": "countryLK"}, {"name": "Sri Lanka", "value": "LK"},
{"name": "Sudan", "value": "countrySD"}, {"name": "Sudan", "value": "SD"},
{"name": "Suriname", "value": "countrySR"}, {"name": "Suriname", "value": "SR"},
{"name": "Svalbard and Jan Mayen", "value": "countrySJ"}, {"name": "Svalbard and Jan Mayen", "value": "SJ"},
{"name": "Swaziland", "value": "countrySZ"}, {"name": "Swaziland", "value": "SZ"},
{"name": "Sweden", "value": "countrySE"}, {"name": "Sweden", "value": "SE"},
{"name": "Switzerland", "value": "countryCH"}, {"name": "Switzerland", "value": "CH"},
{"name": "Syrian Arab Republic", "value": "countrySY"}, {"name": "Syrian Arab Republic", "value": "SY"},
{"name": "Taiwan", "value": "countryTW"}, {"name": "Taiwan", "value": "TW"},
{"name": "Tajikistan", "value": "countryTJ"}, {"name": "Tajikistan", "value": "TJ"},
{"name": "Tanzania, United Republic of", "value": "countryTZ"}, {"name": "Tanzania, United Republic of", "value": "TZ"},
{"name": "Thailand", "value": "countryTH"}, {"name": "Thailand", "value": "TH"},
{"name": "Togo", "value": "countryTG"}, {"name": "Togo", "value": "TG"},
{"name": "Tokelau", "value": "countryTK"}, {"name": "Tokelau", "value": "TK"},
{"name": "Tonga", "value": "countryTO"}, {"name": "Tonga", "value": "TO"},
{"name": "Trinidad and Tobago", "value": "countryTT"}, {"name": "Trinidad and Tobago", "value": "TT"},
{"name": "Tunisia", "value": "countryTN"}, {"name": "Tunisia", "value": "TN"},
{"name": "Turkey", "value": "countryTR"}, {"name": "Turkey", "value": "TR"},
{"name": "Turkmenistan", "value": "countryTM"}, {"name": "Turkmenistan", "value": "TM"},
{"name": "Turks and Caicos Islands", "value": "countryTC"}, {"name": "Turks and Caicos Islands", "value": "TC"},
{"name": "Tuvalu", "value": "countryTV"}, {"name": "Tuvalu", "value": "TV"},
{"name": "Uganda", "value": "countryUG"}, {"name": "Uganda", "value": "UG"},
{"name": "Ukraine", "value": "countryUA"}, {"name": "Ukraine", "value": "UA"},
{"name": "United Arab Emirates", "value": "countryAE"}, {"name": "United Arab Emirates", "value": "AE"},
{"name": "United Kingdom", "value": "countryUK"}, {"name": "United Kingdom", "value": "UK"},
{"name": "United States", "value": "countryUS"}, {"name": "United States", "value": "US"},
{"name": "United States Minor Outlying Islands", "value": "countryUM"}, {"name": "United States Minor Outlying Islands", "value": "UM"},
{"name": "Uruguay", "value": "countryUY"}, {"name": "Uruguay", "value": "UY"},
{"name": "Uzbekistan", "value": "countryUZ"}, {"name": "Uzbekistan", "value": "UZ"},
{"name": "Vanuatu", "value": "countryVU"}, {"name": "Vanuatu", "value": "VU"},
{"name": "Venezuela", "value": "countryVE"}, {"name": "Venezuela", "value": "VE"},
{"name": "Vietnam", "value": "countryVN"}, {"name": "Vietnam", "value": "VN"},
{"name": "Virgin Islands, British", "value": "countryVG"}, {"name": "Virgin Islands, British", "value": "VG"},
{"name": "Virgin Islands, U.S.", "value": "countryVI"}, {"name": "Virgin Islands, U.S.", "value": "VI"},
{"name": "Wallis and Futuna", "value": "countryWF"}, {"name": "Wallis and Futuna", "value": "WF"},
{"name": "Western Sahara", "value": "countryEH"}, {"name": "Western Sahara", "value": "EH"},
{"name": "Yemen", "value": "countryYE"}, {"name": "Yemen", "value": "YE"},
{"name": "Yugoslavia", "value": "countryYU"}, {"name": "Yugoslavia", "value": "YU"},
{"name": "Zambia", "value": "countryZM"}, {"name": "Zambia", "value": "ZM"},
{"name": "Zimbabwe", "value": "countryZW"} {"name": "Zimbabwe", "value": "ZW"}
] ]

48
app/static/settings/translations.json
Unescape Escape View File

@ -2,8 +2,7 @@
"lang_en": { "lang_en": {
"search": "Search", "search": "Search",
"config": "Configuration", "config": "Configuration",
"config-country": "Filter Results by Country", "config-country": "Set Country",
"config-country-help": "Note: If enabled, a website will only appear in the search results if it is *hosted* in the selected country.",
"config-lang": "Interface Language", "config-lang": "Interface Language",
"config-lang-search": "Search Language", "config-lang-search": "Search Language",
"config-near": "Near", "config-near": "Near",
@ -39,8 +38,7 @@
"lang_nl": { "lang_nl": {
"search": "Zoeken", "search": "Zoeken",
"config": "Instellingen", "config": "Instellingen",
"config-country": "Filter zoek resultaten bij land", "config-country": "Land instellen",
"config-country-help": "Let op: Als je dit aanzet zal alleen website die gehost worden in het land weergegeven worden.",
"config-lang": "Taal instellingen", "config-lang": "Taal instellingen",
"config-lang-search": "Zoek taal", "config-lang-search": "Zoek taal",
"config-near": "Dichtbij", "config-near": "Dichtbij",
@ -76,8 +74,7 @@
"lang_de": { "lang_de": {
"search": "Suchen", "search": "Suchen",
"config": "Einstellungen", "config": "Einstellungen",
"config-country": "Ergebnisse nach Land filtern", "config-country": "Land einstellen",
"config-country-help": "Hinweis: Wenn aktiv, wird eine Webseite nur angezeigt, wenn sie auch in dem jeweiligen Land *gehosted* wird.",
"config-lang": "Oberflächen-Sprache", "config-lang": "Oberflächen-Sprache",
"config-lang-search": "Such-Sprache", "config-lang-search": "Such-Sprache",
"config-near": "In der Nähe von", "config-near": "In der Nähe von",
@ -113,8 +110,7 @@
"lang_es": { "lang_es": {
"search": "Buscar", "search": "Buscar",
"config": "Configuración", "config": "Configuración",
"config-country": "Filtrar Resultados por País", "config-country": "Establecer País",
"config-country-help": "Nota: Si está habilitado, un sitio web solo aparecerá en los resultados de búsqueda si está alojado en ese país.",
"config-lang": "Idioma de Interfaz", "config-lang": "Idioma de Interfaz",
"config-lang-search": "Idioma de Búsqueda", "config-lang-search": "Idioma de Búsqueda",
"config-near": "Cerca", "config-near": "Cerca",
@ -150,8 +146,7 @@
"lang_it": { "lang_it": {
"search": "Cerca", "search": "Cerca",
"config": "Impostazioni", "config": "Impostazioni",
"config-country": "Filtra risultati per paese", "config-country": "Imposta Paese",
"config-country-help": "Nota: se abilitato, il sito sarà presente tra i risultati se e soltanto se il server risiede nel paese selezionato",
"config-lang": "Lingua dell'interfaccia", "config-lang": "Lingua dell'interfaccia",
"config-lang-search": "Lingua della ricerca", "config-lang-search": "Lingua della ricerca",
"config-near": "Vicino", "config-near": "Vicino",
@ -187,8 +182,7 @@
"lang_pt": { "lang_pt": {
"search": "Pesquisar", "search": "Pesquisar",
"config": "Configuração", "config": "Configuração",
"config-country": "Filtrar Resultados por País", "config-country": "Definir País",
"config-country-help": "Observação: Se ativado, um site só aparecerá nos resultados da pesquisa se estiver *hospedado* no país selecionado.",
"config-lang": "Idioma da Interface", "config-lang": "Idioma da Interface",
"config-lang-search": "Idioma da Pesquisa", "config-lang-search": "Idioma da Pesquisa",
"config-near": "Perto", "config-near": "Perto",
@ -224,8 +218,7 @@
"lang_ru": { "lang_ru": {
"search": "Поиск", "search": "Поиск",
"config": "Настройка", "config": "Настройка",
"config-country": "Фильтр результатов по стране", "config-country": "Установить страну",
"config-country-help": "Примечание: Если включено, то веб-сайт будет отображаться в результатах поиска только в том случае, если он *размещен* в выбранной стране.",
"config-lang": "Язык интерфейса", "config-lang": "Язык интерфейса",
"config-lang-search": "Язык поиска", "config-lang-search": "Язык поиска",
"config-near": "Около", "config-near": "Около",
@ -261,8 +254,7 @@
"lang_zh-CN": { "lang_zh-CN": {
"search": "搜索", "search": "搜索",
"config": "配置", "config": "配置",
"config-country": "按国家过滤搜索结果", "config-country": "设置国家",
"config-country-help": "注意：启用后，只有在所选国家*部署*的网站会出现在搜索结果中。",
"config-lang": "界面语言", "config-lang": "界面语言",
"config-lang-search": "搜索语言", "config-lang-search": "搜索语言",
"config-near": "接近", "config-near": "接近",
@ -298,8 +290,7 @@
"lang_si": { "lang_si": {
"search": "සොයන්න", "search": "සොයන්න",
"config": "වින්‍යාසය", "config": "වින්‍යාසය",
"config-country": "රට අනුව ප්‍රතිඵල පෙරන්න", "config-country": "රට සකසන්න",
"config-country-help": "සටහන: සබල කර ඇත්නම්, වියමන අඩවියක් සෙවුම් ප්‍රතිඵලවල දිස්වන්නේ එය තෝරාගත් රටෙහි සිට *සත්කාරකත්වය* දරන්නේ නම් පමණි.",
"config-lang": "අතුරු මුහුණතෙහි භාෂාව", "config-lang": "අතුරු මුහුණතෙහි භාෂාව",
"config-lang-search": "සෙවුම් භාෂාව", "config-lang-search": "සෙවුම් භාෂාව",
"config-near": "ආසන්න", "config-near": "ආසන්න",
@ -335,8 +326,7 @@
"lang_fr": { "lang_fr": {
"search": "Chercher", "search": "Chercher",
"config": "Configuration", "config": "Configuration",
"config-country": "Filter les Résultats par Pays", "config-country": "Définir le pays",
"config-country-help": "Note : Si activé, un site web va uniquement apparaitre dans les résultat de la recherche si il est *hébérgé* dans le pays sélectionné.",
"config-lang": "Langage de l'Interface", "config-lang": "Langage de l'Interface",
"config-lang-search": "Langage de Recherche", "config-lang-search": "Langage de Recherche",
"config-near": "Proche", "config-near": "Proche",
@ -372,8 +362,7 @@
"lang_fa": { "lang_fa": {
"search": "جستجو", "search": "جستجو",
"config": "پیکربندی", "config": "پیکربندی",
"config-country": "فیلتر نتایج بر اساس کشور", "config-country": "کشور را تنظیم کنید",
"config-country-help": "توجه: در صورت فعال بودن، وبسایت تنها در صورتی نمایش داده می‌شود که *در کشور انتخابی میزبانی شده باشد*.",
"config-lang": "زبان رابط کاربری", "config-lang": "زبان رابط کاربری",
"config-lang-search": "زبان جستجو", "config-lang-search": "زبان جستجو",
"config-near": "نزدیک", "config-near": "نزدیک",
@ -409,8 +398,7 @@
"lang_cs": { "lang_cs": {
"search": "Hledat", "search": "Hledat",
"config": "Konfigurace", "config": "Konfigurace",
"config-country": "Filtrovat výsledky podle země", "config-country": "Nastavte zemi",
"config-country-help": "Poznámka: Pokud je povoleno, webová stránka se objeví ve výsledcích vyhledávání, pouze pokud je *hostována* ve vybrané zemi.",
"config-lang": "Jazyk rozhraní", "config-lang": "Jazyk rozhraní",
"config-lang-search": "Jazyk vyhledávání", "config-lang-search": "Jazyk vyhledávání",
"config-near": "Poblíž", "config-near": "Poblíž",
@ -446,8 +434,7 @@
"lang_zh-TW": { "lang_zh-TW": {
"search": "搜尋", "search": "搜尋",
"config": "設定", "config": "設定",
"config-country": "依國家過濾結果", "config-country": "設置國家",
"config-country-help": "注意：一經套用，只有在部署在指定國家內的網站會出現在搜尋結果中。",
"config-lang": "界面語言", "config-lang": "界面語言",
"config-lang-search": "搜尋語言", "config-lang-search": "搜尋語言",
"config-near": "接近", "config-near": "接近",
@ -483,8 +470,7 @@
"lang_bg": { "lang_bg": {
"search": "Търсене", "search": "Търсене",
"config": "Конфигурация", "config": "Конфигурация",
"config-country": "Филтрирай резултатите по държави", "config-country": "Задайте държава",
"config-country-help": "Забележка: Ако това е разрешено, уебсайтoвете ще се показват в резултатите от търсенето, само ако са * хоствани * в избраната държава.",
"config-lang": "Език на интерфейса", "config-lang": "Език на интерфейса",
"config-lang-search": "Език за търсене", "config-lang-search": "Език за търсене",
"config-near": "Близо до", "config-near": "Близо до",
@ -520,8 +506,7 @@
"lang_hi": { "lang_hi": {
"search": "खोज", "search": "खोज",
"config": "कॉन्फ़िगरेशन", "config": "कॉन्फ़िगरेशन",
"config-country": "देश के अनुसार परिणाम फ़िल्टर करें", "config-country": "देश सेट करें",
"config-country-help": "नोट: यदि सक्षम है, तो कोई वेबसाइट खोज परिणामों में केवल तभी दिखाई देगी जब वह चयनित देश में *होस्ट* हो।",
"config-lang": "इंटरफ़ेस भाषा", "config-lang": "इंटरफ़ेस भाषा",
"config-lang-search": "खोज की भाषा", "config-lang-search": "खोज की भाषा",
"config-near": "पास", "config-near": "पास",
@ -557,8 +542,7 @@
"lang_ja": { "lang_ja": {
"search": "検索", "search": "検索",
"config": "設定", "config": "設定",
"config-country": "検索結果を国でフィルタ", "config-country": "国を設定する",
"config-country-help": "注: 有効にした場合、選択した国で*ホストされている*ウェブサイトのみが検索結果に表示されます。",
"config-lang": "インタフェースの言語", "config-lang": "インタフェースの言語",
"config-lang-search": "検索する言語", "config-lang-search": "検索する言語",
"config-near": "場所", "config-near": "場所",

1
app/templates/index.html
Unescape Escape View File

@ -97,7 +97,6 @@
</option> </option>
{% endfor %} {% endfor %}
</select> </select>
<div><span class="info-text"> — {{ translation['config-country-help'] }}</span></div>
</div> </div>
<div class="config-div config-div-lang"> <div class="config-div config-div-lang">
<label for="config-lang-interface">{{ translation['config-lang'] }}: </label> <label for="config-lang-interface">{{ translation['config-lang'] }}: </label>

Write Preview
Loading…
Cancel
Save