Fix several i18n-related defects (LMMS#3111)

lizho · Nov 12, 2016 · 89bfd32 · 89bfd32
1 parent 2574254
commit 89bfd32
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/data/locale/en.ts b/data/locale/en.ts
@@ -4087,6 +4087,19 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>MidiJack</name>
+    <message>
+        <source>JACK server down</source>
+        <extracomment>When JACK(JACK Audio Connection Kit) disconnects, it will show the following message (title)</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The JACK server seems to be shuted down.</source>
+        <extracomment>When JACK(JACK Audio Connection Kit) disconnects, it will show the following message (dialog message)</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MidiPort</name>
     <message>

diff --git a/include/MidiJack.h b/include/MidiJack.h
@@ -42,8 +42,9 @@
 
 class QLineEdit;
 
-class MidiJack : public MidiClientRaw, public QThread
+class MidiJack : public QThread, public MidiClientRaw
 {
+        Q_OBJECT
 public:
 	MidiJack();
 	virtual ~MidiJack();

diff --git a/src/core/midi/MidiJack.cpp b/src/core/midi/MidiJack.cpp
@@ -58,10 +58,11 @@ static int JackMidiProcessCallback(jack_nframes_t nframes, void *arg)
 
 static void JackMidiShutdown(void *arg)
 {
-	// TODO: support translations here
-	const QString mess_short = "JACK server down";
-	const QString mess_long = "The JACK server seems to have been shutdown.";
-	QMessageBox::information( gui->mainWindow(), mess_short, mess_long );
+        //: When JACK(JACK Audio Connection Kit) disconnects, it will show the following message (title)
+	QString msg_short = MidiJack::tr("JACK server down");
+        //: When JACK(JACK Audio Connection Kit) disconnects, it will show the following message (dialog message)
+	QString msg_long = MidiJack::tr("The JACK server seems to be shuted down.");
+	QMessageBox::information( gui->mainWindow(), msg_short, msg_long );
 }
 
 MidiJack::MidiJack() :

diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp
@@ -1214,6 +1214,7 @@ QMenu * InstrumentTrackView::createFxMenu(QString title, QString newFxLabel)
 
 class fxLineLcdSpinBox : public LcdSpinBox
 {
+        Q_OBJECT
 	public:
 		fxLineLcdSpinBox( int _num_digits, QWidget * _parent,
 				const QString & _name ) :
@@ -1820,3 +1821,5 @@ void InstrumentTrackWindow::viewPrevInstrument()
 {
 	viewInstrumentInDirection(-1);
 }
+
+#include "InstrumentTrack.moc"