From 3faaaacda8c0cb58763cd8d9235bae9820cc46af Mon Sep 17 00:00:00 2001 From: Vitaly Livshic Date: Mon, 24 Jul 2017 21:26:31 +0300 Subject: [PATCH] Invalid translations fix --- src/dlangui/dialogs/filedlg.d | 11 ++++++----- src/dlangui/dialogs/settingsdialog.d | 4 ++-- src/dlangui/widgets/charts.d | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/dlangui/dialogs/filedlg.d b/src/dlangui/dialogs/filedlg.d index 22ec3bb1..d0da1393 100644 --- a/src/dlangui/dialogs/filedlg.d +++ b/src/dlangui/dialogs/filedlg.d @@ -45,6 +45,7 @@ private import std.utf : toUTF32; private import std.string; private import std.array; private import std.conv : to; +private import std.conv : dtext; private import std.array : split; @@ -597,9 +598,9 @@ class FileDialog : Dialog, CustomGridCellAdapter { _fileList.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT); _fileList.resize(4, 3); _fileList.setColTitle(0, " "d); - _fileList.setColTitle(1, "COL_NAME"d); - _fileList.setColTitle(2, "COL_SIZE"d); - _fileList.setColTitle(3, "COL_MODIFIED"d); + _fileList.setColTitle(1, dtext("COL_NAME"c)); + _fileList.setColTitle(2, dtext("COL_SIZE"c)); + _fileList.setColTitle(3, dtext("COL_MODIFIED"c)); _fileList.showRowHeaders = false; _fileList.rowSelect = true; _fileList.multiSelect = _allowMultipleFiles; @@ -927,7 +928,7 @@ class FileNameEditLine : HorizontalLayout { protected EditLine _edFileName; protected Button _btn; protected string[string] _filetypeIcons; - protected dstring _caption = "TITLE_OPEN_FILE"d; + protected dstring _caption = dtext("TITLE_OPEN_FILE"c); protected uint _fileDialogFlags = DialogFlag.Modal | DialogFlag.Resizable | FileDialogFlag.FileMustExist | FileDialogFlag.EnableCreateDirectory; protected FileFilterEntry[] _filters; protected int _filterIndex; @@ -1031,7 +1032,7 @@ class DirEditLine : FileNameEditLine { super(ID); _fileDialogFlags = DialogFlag.Modal | DialogFlag.Resizable | FileDialogFlag.FileMustExist | FileDialogFlag.SelectDirectory | FileDialogFlag.EnableCreateDirectory; - _caption = "ACTION_SELECT_DIRECTORY"d; + _caption = dtext("ACTION_SELECT_DIRECTORY"c); } } diff --git a/src/dlangui/dialogs/settingsdialog.d b/src/dlangui/dialogs/settingsdialog.d index 6f62b7eb..7a82f818 100644 --- a/src/dlangui/dialogs/settingsdialog.d +++ b/src/dlangui/dialogs/settingsdialog.d @@ -256,7 +256,7 @@ class ExecutableFileNameEditItem : SettingsItem { import dlangui.dialogs.filedlg; TextWidget lbl = new TextWidget(_id ~ "-label", _label); FileNameEditLine ed = new FileNameEditLine(_id ~ "-filename-edit"); - ed.addFilter(FileFilterEntry(UIString.fromRaw("MESSAGE_EXECUTABLES"d), "*.exe", true)); + ed.addFilter(FileFilterEntry(UIString.fromRaw("MESSAGE_EXECUTABLES"c), "*.exe", true)); ed.minWidth = 200; Setting setting = settings.settingByPath(_id, SettingType.STRING); string value = setting.strDef(_defaultValue); @@ -281,7 +281,7 @@ class PathNameEditItem : SettingsItem { import dlangui.dialogs.filedlg; TextWidget lbl = new TextWidget(_id ~ "-label", _label); DirEditLine ed = new DirEditLine(_id ~ "-path-edit"); - ed.addFilter(FileFilterEntry(UIString.fromRaw("MESSAGE_ALL_FILES"d), "*.*")); + ed.addFilter(FileFilterEntry(UIString.fromRaw("MESSAGE_ALL_FILES"c), "*.*")); ed.minWidth = 200; Setting setting = settings.settingByPath(_id, SettingType.STRING); string value = setting.strDef(_defaultValue); diff --git a/src/dlangui/widgets/charts.d b/src/dlangui/widgets/charts.d index 9f729c57..d99ce9e5 100644 --- a/src/dlangui/widgets/charts.d +++ b/src/dlangui/widgets/charts.d @@ -53,7 +53,7 @@ class SimpleBarChart : Widget { trackHover = false; styleId = "SIMPLE_BAR_CHART"; _axisX.arrowSize = 1; - title = "TITLE_NEW_CHART"d; + title = "TITLE_NEW_CHART"c; measureTextToSetWidgetSize(); }