Merge pull request #86 from lurch/force_arora_language

Rob Bishop · Rob Bishop · commit b3f3c7f3bf33 · 2013-07-07T02:22:20.000-07:00
Ensure that Arora is displayed in English when NOOBS is set to "English ...
diff --git a/recovery/mainwindow.cpp b/recovery/mainwindow.cpp
@@ -515,7 +515,7 @@ void MainWindow::startBrowser()
     else
     {
         QProcess *proc = new QProcess(this);
-        proc->start(QString("arora -lang %1 " HOMEPAGE).arg(*_currentLang!=""?*_currentLang:"en"));
+        proc->start(QString("arora -lang %1 " HOMEPAGE).arg((*_currentLang!="gb" && *_currentLang!="us")?*_currentLang:"en"));
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,7 @@ void MainWindow::startBrowser()`
`515`	`515`	`else`
`516`	`516`	`{`
`517`	`517`	`QProcess *proc = new QProcess(this);`
`518`		`- proc->start(QString("arora -lang %1 " HOMEPAGE).arg(_currentLang!=""?_currentLang:"en"));`
	`518`	`+ proc->start(QString("arora -lang %1 " HOMEPAGE).arg((_currentLang!="gb" && _currentLang!="us")?*_currentLang:"en"));`
`519`	`519`	`}`
`520`	`520`	`}`
`521`	`521`