Small tweaks

git-svn-id: file:///srv/svn/repo/mai/trunk@26 e410bdd4-646f-c54f-a7ce-fffcc4f439ae

engines/google.go

@@ -15,7 +15,7 @@ import (
 
 type GoogleTranslate struct{}
 
-func (_ *GoogleTranslate) DisplayName() string { return "Google" }
+func (_ *GoogleTranslate) DisplayName() string { return "Google Translate" }
 
 func (_ *GoogleTranslate) getLangs(type_ string) (Language, error) {
 	var langsType string

engines/reverseo.go

@@ -10,7 +10,7 @@ import (
 // Reverso is an engine that fetches data from https://reverso.net.
 type Reverso struct{}
 
-func (_ *Reverso) DisplayName() string { return "Reverso" }
+func (_ *Reverso) DisplayName() string { return "Reverseo" }
 
 var reversoLangs = Language{
 	"ara": "Arabic",
@@ -40,7 +40,12 @@ var reversoLangs = Language{
 	"ukr": "Ukrainian",
 }
 
-func (_ *Reverso) SourceLanguages() (Language, error) { return reversoLangs, nil }
+func (_ *Reverso) SourceLanguages() (Language, error) {
+	langs := reversoLangs
+	langs["auto"] = "Detect language"
+
+	return langs, nil
+}
 
 func (_ *Reverso) TargetLanguages() (Language, error) { return reversoLangs, nil }
 

web/main.go

@@ -42,6 +42,7 @@ func main() {
 		to := ""
 		ttsFrom := ""
 		ttsTo := ""
+		sourceLanguage := ""
 
 		var translation engines.TranslationResult
 		if c.Method() == "POST" {
@@ -53,7 +54,7 @@ func main() {
 			} else {
 				translatedText = result.TranslatedText
 				translation = result
-				from = result.SourceLanguage
+				sourceLanguage = result.SourceLanguage
 			}
 
 			ttsFromURL, _ := url.Parse("api/tts")
@@ -94,6 +95,10 @@ func main() {
 			return c.SendStatus(400)
 		}
 
+		if from == "" {
+			from = "auto"
+		}
+
 		enginesNames := map[string]string{}
 		for k, v := range engines.Engines {
 			enginesNames[k] = v.DisplayName()
@@ -110,6 +115,7 @@ func main() {
 			"To":              to,
 			"TtsFrom":         ttsFrom,
 			"TtsTo":           ttsTo,
+			"SourceLanguage":  sourceLanguage,
 		})
 	})
 

web/views/index.html

@@ -34,8 +34,12 @@
             <div class="language">
                 <select name="from" aria-label="Source language">
                     {{range $code, $name := .SourceLanguages}}
+                    {{if and (eq $code "auto") $.SourceLanguage}}
+                    <option value="{{ $code }}" {{if eq $code $.From}}selected{{end}}>{{ $name }} ({{index $.SourceLanguages $.SourceLanguage}})</option>
+                    {{else }}
                     <option value="{{ $code }}" {{if eq $code $.From}}selected{{end}}>{{ $name }}</option>
                     {{end}}
+                    {{end}}
                 </select>
             </div>
 
@@ -78,7 +82,7 @@
         <br>
 
         <div class="center">
-            <button type="submit">Translate with {{ .Engine }}!</button>
+            <button type="submit">Translate with {{ index .enginesNames .Engine }}!</button>
         </div>
 
         <br>