Merge lp:~marten-de-vries/openteacher/2.x-documentation into lp:~openteachermaintainers/openteacher/2.x-broken

[Marten de Vries]

The Accept-Language header is now set when requesting the documentation site.

An Accept-Language header is now sent.

[Marten de Vries (marten-de-vries)]

The headers were sent (according to Wireshark), and I couldn't find any bugs, so I merged it.

review: Approve

=== modified file 'src/openteacher.py'
--- src/openteacher.py	2011-06-13 19:29:06 +0000
+++ src/openteacher.py	2011-06-17 11:31:42 +0000
@@ -86,7 +86,7 @@
 
 #import PyQt4 and dependancies
 import sys
-from PyQt4 import QtGui, QtCore, QtWebKit
+from PyQt4 import QtGui, QtCore, QtWebKit, QtNetwork
 
 #import mainwindow
 import gui.openteacher
@@ -272,12 +272,15 @@
 			self.view().setHtml("<p>%s</p>" % text)
 
 class DocumentationDialog(QtGui.QDialog):
-	def __init__(self, parent=None):
+	def __init__(self, language, parent=None):
 		QtGui.QDialog.__init__(self, parent)
 
 		webView = QtWebKit.QWebView()
 		webView.setPage(OpenTeacherWebPage(webView))
-		webView.setUrl(QtCore.QUrl(DOCUMENTATION_URL))
+
+		request = QtNetwork.QNetworkRequest(QtCore.QUrl(DOCUMENTATION_URL))
+		request.setRawHeader("Accept-Language", language)
+		webView.load(request)
 		
 		vbox = QtGui.QVBoxLayout()
 		vbox.setContentsMargins(0, 0, 0, 0)
@@ -2135,7 +2138,15 @@
 
 	def showDocumentationDialog(self):
 		"""Shows the documentation dialog. Called by the user via action."""
-		docDialog = DocumentationDialog(self)
+		#Get language
+		#If the settings-dialog is never opened
+		if self.settings.value("language").isNull():
+				langAndCountry = unicode(QtCore.QLocale().name())
+				lang = langAndCountry[:langAndCountry.find("_")]
+		else:
+				lang = unicode(self.settings.value("language").toString())
+
+		docDialog = DocumentationDialog(lang, self)
 		docDialog.exec_()
 
 	def setupDesignedDialog(self, designedDialogClass):