[Surfraw-commits] [SCM] surfraw - a fast unix command line interface to WWW branch, 2.2.9_release_candidate, updated. surfraw_2-2-5_1-253-g4061af4
jasonwryan
jasonwryan at gmail.com
Thu Oct 25 08:25:04 UTC 2012
The following commit has been merged in the 2.2.9_release_candidate branch:
commit 4061af4a11f68a781e6d14080e88172fc1b92baf
Author: jasonwryan <jasonwryan at gmail.com>
Date: Thu Oct 25 21:23:28 2012 +1300
Removed other providers
Neither Bing nor translate.reference.com work with surfraw
diff --git a/elvi/translate b/elvi/translate
index fae9e55..7424537 100755
--- a/elvi/translate
+++ b/elvi/translate
@@ -1,11 +1,10 @@
#!/bin/sh
# $Id$
-# elvis: translate -- Translate human languages (various providers)
+# elvis: translate -- Translate human languages
. surfraw || exit 1
w3_config_hook () {
-def SURFRAW_translate_provider babelfish
-def SURFRAW_translate_from "$SURFRAW_lang"
+def SURFRAW_translate_from "$SURFRAW_lang"
def SURFRAW_translate_to "$SURFRAW_lang"
}
@@ -15,22 +14,19 @@ Usage: $w3_argv0 [options] [words|URI]...
Description:
Surfraw translate human language
Local options:
- -from=LANGUAGE Source language
- Environment: SURFRAW_translate_from, SURFRAW_lang
- -to=LANGUAGE Destination language
- Environment: SURFRAW_translate_to, SURFRAW_lang
- -provider= Translation service provider
- babelfish babelfish.yahoo.com (systrans)
- raging babelfish.yahoo.com/raging (systrans)
- google http://translate.google.com
- Default: $SURFRAW_translate_provider
- Environment: SURFRAW_translate_provider
+
+ -from=LANGUAGE Source language
+ Environment: SURFRAW_translate_from, SURFRAW_lang
+
+ -to=LANGUAGE Destination language
+ Environment: SURFRAW_translate_to, SURFRAW_lang
+
Languages (any provider):
nl Dutch
en English
fr French
de German
- el Greek
+ el Greek
it Italian
ja Japanese
ko Korean
@@ -38,61 +34,60 @@ Languages (any provider):
ru Russian
es Spanish
Languages (Systrans only):
- zh Chinese (Simplified)
- zt Chinese (Traditional)
+ zh Chinese (Simplified)
+ zt Chinese (Traditional)
Languages (Google only):
- auto Automatically detect language
- af Afrikaans
- sq Albanian
- ar Arabic
- hy Armenian
- az Azerbaijani
- eu Basque
- be Belarusian
- bg Bulgarian
- ca Catalan
- zh-CN Chinese (Simplified)
- zh-TW Chinese (Traditional)
- hr Croatian
- cs Czech
- da Danish
- et Estonian
- tl Filipino
- fi Finnish
- gl Galician
- ka Georgian
- ht Hatian Creole
- iw Hebrew
- hi Hindi
- hu Hungarian
- is Icelandic
- id Indonesian
- ga Irish
- la Latin
- lv Latvian
- lt Lithuanian
- mk Macedonian
- ms Malay
- mt Maltese
- no Norwegian
- fa Persian
- pl Polish
- ro Romanian
- sr Serbian
- sk Slovak
- sl Slovenian
- sw Swahili
- sv Swedish
- th Thai
- tr Turkish
- uk Ukrainian
- ur Urdu
- vi Vietnamese
- cy Welsh
- yi Yiddish
+ auto Automatically detect language
+ af Afrikaans
+ sq Albanian
+ ar Arabic
+ hy Armenian
+ az Azerbaijani
+ eu Basque
+ be Belarusian
+ bg Bulgarian
+ ca Catalan
+ zh-CN Chinese (Simplified)
+ zh-TW Chinese (Traditional)
+ hr Croatian
+ cs Czech
+ da Danish
+ et Estonian
+ tl Filipino
+ fi Finnish
+ gl Galician
+ ka Georgian
+ ht Hatian Creole
+ iw Hebrew
+ hi Hindi
+ hu Hungarian
+ is Icelandic
+ id Indonesian
+ ga Irish
+ la Latin
+ lv Latvian
+ lt Lithuanian
+ mk Macedonian
+ ms Malay
+ mt Maltese
+ no Norwegian
+ fa Persian
+ pl Polish
+ ro Romanian
+ sr Serbian
+ sk Slovak
+ sl Slovenian
+ sw Swahili
+ sv Swedish
+ th Thai
+ tr Turkish
+ uk Ukrainian
+ ur Urdu
+ vi Vietnamese
+ cy Welsh
+ yi Yiddish
Examples:
$w3_argv0 Provider's standard translation page
- $w3_argv0 -provider=raging Use raging search as a translation provider
$w3_argv0 -from=fr -to=en la verite vous liberera
$w3_argv0 -from=en -to=es http://tashian.com/multibabel
Translate the given Web page
@@ -126,9 +121,8 @@ w3_parse_option_hook () {
opt="$1"
optarg="$2"
case "$opt" in
- -from=*) setopt SURFRAW_translate_from $optarg ;;
- -to=*) setopt SURFRAW_translate_to $optarg ;;
- -provider=*) setopt SURFRAW_translate_provider $optarg ;;
+ -from=*) setopt SURFRAW_translate_from $optarg ;;
+ -to=*) setopt SURFRAW_translate_to $optarg ;;
*) return 1 ;;
esac
return 0
@@ -137,47 +131,24 @@ w3_parse_option_hook () {
w3_config
w3_parse_args "$@"
# w3_args now contains a list of arguments
-if [ "$SURFRAW_translate_provider" = "google" ]
-then
- if test -z "$w3_args"
+if test -z "$w3_args"
then w3_browse_url "http://translate.google.com/"
- else
- if [ -z "$SURFRAW_translate_to" ];
- then
- SURFRAW_translate_to="en"
- fi
- if [ -z "$SURFRAW_translate_from" ];
- then
- SURFRAW_translate_from="fr"
- fi
- escaped_args=`w3_url_of_arg $w3_args`
- case "$escaped_args" in
- http*) w3_browse_url "http://translate.google.com/translate?&sl=${SURFRAW_translate_from}&tl=${SURFRAW_translate_to}&u=${escaped_args}"
- ;;
- *) w3_browse_url "http://translate.google.com/?&sl=${SURFRAW_translate_from}&tl=${SURFRAW_translate_to}&q=${escaped_args}"
- ;;
- esac
- fi
else
- if test -z "$w3_args"
- then w3_browse_url "http://babelfish.yahoo.com/"
- else
- if [ -z "$SURFRAW_translate_to" ];
- then
- SURFRAW_translate_to="en"
- fi
- if [ -z "$SURFRAW_translate_from" ];
- then
- SURFRAW_translate_from="fr"
- fi
- escaped_args=`w3_url_of_arg $w3_args`
- case "$escaped_args" in
- http*) w3_browse_url "http://babelfish.yahoo.com/translate_url?tt=url&url=${escaped_args}&lp=${SURFRAW_translate_from}_${SURFRAW_translate_to}"
- ;;
- *) w3_browse_url "http://babelfish.yahoo.com/translate_txt?doit=done&tt=urltext&intl=1&urltext=${escaped_args}&lp=${SURFRAW_translate_from}_${SURFRAW_translate_to}"
- ;;
- esac
+ if [ -z "$SURFRAW_translate_to" ];
+ then
+ SURFRAW_translate_to="en"
fi
+ if [ -z "$SURFRAW_translate_from" ];
+ then
+ SURFRAW_translate_from="fr"
+ fi
+ escaped_args=`w3_url_of_arg $w3_args`
+ case "$escaped_args" in
+ http*) w3_browse_url "http://translate.google.com/translate?&sl=${SURFRAW_translate_from}&tl=${SURFRAW_translate_to}&u=${escaped_args}"
+ ;;
+ *) w3_browse_url "http://translate.google.com/?&sl=${SURFRAW_translate_from}&tl=${SURFRAW_translate_to}&q=${escaped_args}"
+ ;;
+ esac
fi
exit $?
diff --git a/test/translate.test b/test/translate.test
index e2f98d2..e9b3552 100644
--- a/test/translate.test
+++ b/test/translate.test
@@ -1,4 +1,2 @@
translate -from=en -to=de cats
-Katzen
-translate -provider=google -from=en -to=es cats
-gatos
+Katze
--
surfraw - a fast unix command line interface to WWW
More information about the Surfraw-commits
mailing list