Commit b0b29b91 authored by intrigeri's avatar intrigeri
Browse files

Get rid of unused STARTPAGE_LANG_UI.

We have values for it but so far it's never been used (we did
s/\${LANG_UI}/${STARTPAGE_LANG}/, probably a copy'n'paste typo) and apparently
it has not caused problems.
parent 7e0f6fc0
......@@ -41,14 +41,14 @@ fi
# This very long while-loop is fed the DESCRIPTIONS_FILE (IO
# redirection at the bottom), which describes how we will localize
# each supported Tor Browser locale. The format is:
# MOZILLA_LOCALE:LOCATION:LOCALIZED_LANG:STARTPAGE_LANG:STARTPAGE_LANG_UI
# MOZILLA_LOCALE:LOCATION:LOCALIZED_LANG:STARTPAGE_LANG
# Note that we're forced to pick some representative location for the
# language-only locales, like Egypt (EG) for Arabic (ar).
while IFS=: read MOZILLA_LOCALE LOCATION LOCALIZED_LANG STARTPAGE_LANG STARTPAGE_LANG_UI; do
while IFS=: read MOZILLA_LOCALE LOCATION LOCALIZED_LANG STARTPAGE_LANG; do
if [ -z "${MOZILLA_LOCALE}" ] || [ -z "${LOCATION}" ] || \
[ -z "${LOCALIZED_LANG}" ] || [ -z "${STARTPAGE_LANG}" ]; then
echo "Something is wrong with ${DESCRIPTIONS_FILE}" >&2
echo "Description: ${MOZILLA_LOCALE}:${LOCATION}:${LOCALIZED_LANG}:${STARTPAGE_LANG}:${STARTPAGE_LANG_UI}" >&2
echo "Description: ${MOZILLA_LOCALE}:${LOCATION}:${LOCALIZED_LANG}:${STARTPAGE_LANG}" >&2
exit 1
fi
......@@ -67,12 +67,8 @@ while IFS=: read MOZILLA_LOCALE LOCATION LOCALIZED_LANG STARTPAGE_LANG STARTPAGE
TARGET_SEARCHPLUGINS_DIR="${TBB_LOCALIZED_SEARCHPLUGINS_DIR}/${MOZILLA_LOCALE}"
mkdir -p "${TARGET_SEARCHPLUGINS_DIR}"
if [ -z "${STARTPAGE_LANG_UI}" ]; then
STARTPAGE_LANG_UI=english
fi
sed -e "s/\${LOCALIZED_LANG}/${LOCALIZED_LANG}/" \
-e "s/\${LANG}/${STARTPAGE_LANG}/" \
-e "s/\${LANG_UI}/${STARTPAGE_LANG}/" \
"${BROWSER_LOCALIZATION_DIR}/startpage.xml-template" > \
"${TARGET_SEARCHPLUGINS_DIR}/startpage-${MOZILLA_LOCALE}.xml"
......
ar:EG:عربية:arabic:
de:DE:Deutsch:deutsch:deutsch
es-ES:ES:Español:espanol:espanol
en-US:US:English:english:english
fa:IR:فارسی:persian:
fr:FR:Français:francais:francais
it:IT:Italiano:italiano:italiano
ja:JP:日本語:nihongo:nihongo
ko:KR:한국어:hangul:hangul
nl:NL:Nederlands:nederlands:nederlands
pl:PL:Polski:polski:polski
pt-BR:BR:Português:portugues:portugues
ru:RU:Русский:russian:
tr:TR:Türkçe:turkce:turkce
ar:EG:عربية:arabic
de:DE:Deutsch:deutsch
es-ES:ES:Español:espanol
en-US:US:English:english
fa:IR:فارسی:persian
fr:FR:Français:francais
it:IT:Italiano:italiano
ja:JP:日本語:nihongo
ko:KR:한국어:hangul
nl:NL:Nederlands:nederlands
pl:PL:Polski:polski
pt-BR:BR:Português:portugues
ru:RU:Русский:russian
tr:TR:Türkçe:turkce
vi:VN:Việt Nam:vietnamese:
zh-CN:CN:中文:jiantizhongwen:jiantizhongwen
zh-CN:CN:中文:jiantizhongwen
......@@ -5,7 +5,7 @@
<Description>Startpage - ${LOCALIZED_LANG}</Description>
<Url type="text/html" method="POST" template="https://startpage.com/rto/search">
<Param name="language" value="${LANG}"/>
<Param name="language_ui" value="${LANG_UI}"/>
<Param name="language_ui" value="${LANG}"/>
<Param name="q" value="{searchTerms}"/>
</Url>
<Image height="16" width="16">data:image/png;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2jkj+9YtD/vWLQ/71i0P+9otD/vaLRP72i0T+9YtE/vWLRP72i0T+9otD/vaNRP72jUT+9otF/vaLRf73kkv+9Yc///WJP//1iT//9Yk///rAmf/94Mz/+sCa//aRTv/1iUH/9ok///aJP//2i0H/9otB//aJQv/2iUL/9otC//aNRP/2jUT/9o1E//aNRP/6wpv////////////96dr/95dQ//aNRP/2kET/9pBG//aQRv/2kEb/9pBG//aRR//3lEz/95BH//mueP/7xJ3/959g//efYf/4p23//vDm//3p2//3kEr/95FJ//aRSf/niFH/95FK//aRSv/2mE//95hS/vq4iP/////////////////81bj/95xZ//q4iP//////+bF+//eZT//njFT/PSqi/2xGjv/2mVD/951V/vedVv783cX///////vQrf/++PP///////748//+8uj///////m3gf/olFr/PSuj/w8Pt/9sSJD/951V//eeWf73oVv++8ul///////5sXf/+KRi//vRsf////////////3r3v/olF//Piyk/w8Pt/9sSJH/+J5Z//ieWv/3oV/++KZf/vihXP/97N7//vn0//zTs//6wJP/+bBy//q6iP/onW//Piyl/w8Pt/8fGbH/m2iB/+icY//4pGD/96hl/viqZf74pmD/+Kxr//3iy/////////n1//ivbP/onGj/Pi2m/w8Pt/8uJKz/fFeQ/x8Zsf8+Lqb/6J9r//ivbP74rm3++Klm//mpZv/5q2f/+bR9//m0e//poW7/Pi6n/w8Pt/9sTZj/+Ktp//ira/+rd4P/Dw+3/4xijv/5snH++LN1/vmvbf/5r23/+a5t//mvb//4r2//TTuk/w8Pt/8fGrL/6ah1//ivcP/4r3P/q3yI/w8Pt/+MZpP/+bN5/vm4ev75t3X/+bV1//m1df/5t3X/+Ld3/8qUhP98XZn/Hxqz/+mse//5t3f/2p+B/x8as/8PD7f/u4qK//m7fv76u4D++bl7//m3fP/5uXz/+bl8//m5fP/5t3z/+bl//x8as/9NPKf/fWCb/x8as/8PD7f/bVOh//q5f//6v4X++sGI/vm9g//5voX/+b6F//m9hf/6vYX/+r6F//nCh/+bepr/Hxu0/w8Pt/8PD7f/fWOh//q+hf/6wof/+saN/vrGjf75xIv/+ceL//nEi//5xIv/+sSL//rHi//6x43/+ceN/+m7kP+7lpj/6ruQ//rHkP/6x43/+seQ//rLlf76ypT++seR//rJkf/6yZH/+seR//rJkf/6yZH/+8mR//vJlP/7yZT/+smU//rJlP/6yZT/+8yV//rJlf/6zpn+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==</Image>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment