Skip to content

Commit 36385b6

Browse files
committed
i18n - remove translation switch
1 parent 4f796a3 commit 36385b6

File tree

2 files changed

+10
-22
lines changed

2 files changed

+10
-22
lines changed

app/gui/qt/main.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
// notice is included.
1212
//++
1313

14-
// i18n not enabled until translations are ready
15-
// #define ENABLE_I18N
16-
1714
#include <QApplication>
1815
#include <QSplashScreen>
1916
#include <QPixmap>
@@ -31,7 +28,6 @@ int main(int argc, char *argv[])
3128

3229
QApplication app(argc, argv);
3330

34-
#ifdef ENABLE_I18N
3531
QString systemLocale = QLocale::system().name();
3632

3733
QTranslator qtTranslator;
@@ -44,7 +40,6 @@ int main(int argc, char *argv[])
4440
std::cout << "Please contact us if you want to translate Sonic Pi to your language." << std::endl;
4541
}
4642
app.installTranslator(&translator);
47-
#endif
4843

4944
app.setApplicationName(QObject::tr("Sonic Pi"));
5045
app.setStyle("gtk");

app/server/bin/qt-doc.rb

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525

2626
require 'active_support/inflector'
2727

28-
# i18n not enabled until translations are ready
29-
enable_i18n = false
30-
3128

3229
include SonicPi::Util
3330

@@ -151,20 +148,16 @@
151148
# "loop" => "Loop forever",
152149
}
153150

154-
if enable_i18n then
155-
# this will sort locale code names by reverse length
156-
# to make sure that a more specific locale is handled
157-
# before the generic language code,
158-
# e.g., "de_CH" should be handled before "de"
159-
languages = Dir.
160-
glob("#{tutorial_path}/*").
161-
select {|f| File.directory? f}.
162-
map {|f| File.basename f}.
163-
select {|n| n != "en"}.
164-
sort_by {|n| -n.length}
165-
else
166-
languages = []
167-
end
151+
# this will sort locale code names by reverse length
152+
# to make sure that a more specific locale is handled
153+
# before the generic language code,
154+
# e.g., "de_CH" should be handled before "de"
155+
languages = Dir.
156+
glob("#{tutorial_path}/*").
157+
select {|f| File.directory? f}.
158+
map {|f| File.basename f}.
159+
select {|n| n != "en"}.
160+
sort_by {|n| -n.length}
168161

169162
docs << "\n QString systemLocale = QLocale::system().name();\n\n" unless languages.empty?
170163

0 commit comments

Comments
 (0)