[gnome-shell-extensions/wip/fmuellner/more-style-changes: 7/7] style: Use single-quotes for translated strings
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell-extensions/wip/fmuellner/more-style-changes: 7/7] style: Use single-quotes for translated strings
- Date: Thu, 28 Feb 2019 22:30:58 +0000 (UTC)
commit d83d6e857a2b644b3d9b49e41faa808672807859
Author: Florian Müllner <fmuellner gnome org>
Date: Thu Feb 28 19:18:53 2019 +0100
style: Use single-quotes for translated strings
The coding style of using double quotes for translatable strings
and single quotes otherwise is unnecessarily complex and cannot
be enforced with an eslint rule.
Simply use single quotes consistently for all strings.
https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/57
extensions/apps-menu/extension.js | 6 +++---
extensions/auto-move-windows/prefs.js | 20 ++++++++++----------
extensions/drive-menu/extension.js | 6 +++---
extensions/places-menu/extension.js | 4 ++--
extensions/places-menu/placeDisplay.js | 14 +++++++-------
extensions/window-list/extension.js | 20 ++++++++++----------
extensions/window-list/prefs.js | 10 +++++-----
extensions/workspace-indicator/extension.js | 2 +-
extensions/workspace-indicator/prefs.js | 6 +++---
lint/eslintrc-legacy.json | 3 +--
10 files changed, 45 insertions(+), 46 deletions(-)
---
diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js
index fb5d6fd..0c99123 100644
--- a/extensions/apps-menu/extension.js
+++ b/extensions/apps-menu/extension.js
@@ -26,7 +26,7 @@ class ActivitiesMenuItem extends PopupMenu.PopupBaseMenuItem {
constructor(button) {
super();
this._button = button;
- this.actor.add_child(new St.Label({ text: _("Activities Overview") }));
+ this.actor.add_child(new St.Label({ text: _('Activities Overview') }));
}
activate(event) {
@@ -115,7 +115,7 @@ class CategoryMenuItem extends PopupMenu.PopupBaseMenuItem {
if (this._category)
name = this._category.get_name();
else
- name = _("Favorites");
+ name = _('Favorites');
this.actor.add_child(new St.Label({ text: name }));
this.actor.connect('motion-event', this._onMotionEvent.bind(this));
@@ -404,7 +404,7 @@ class ApplicationsButton extends PanelMenu.Button {
let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
this._label = new St.Label({
- text: _("Applications"),
+ text: _('Applications'),
y_expand: true,
y_align: Clutter.ActorAlign.CENTER
});
diff --git a/extensions/auto-move-windows/prefs.js b/extensions/auto-move-windows/prefs.js
index 3b3a70e..f808347 100644
--- a/extensions/auto-move-windows/prefs.js
+++ b/extensions/auto-move-windows/prefs.js
@@ -57,25 +57,25 @@ const Widget = GObject.registerClass({
let appColumn = new Gtk.TreeViewColumn({
expand: true,
sort_column_id: Columns.DISPLAY_NAME,
- title: _("Application")
+ title: _('Application')
});
let iconRenderer = new Gtk.CellRendererPixbuf;
appColumn.pack_start(iconRenderer, false);
- appColumn.add_attribute(iconRenderer, "gicon", Columns.ICON);
+ appColumn.add_attribute(iconRenderer, 'gicon', Columns.ICON);
let nameRenderer = new Gtk.CellRendererText;
appColumn.pack_start(nameRenderer, true);
- appColumn.add_attribute(nameRenderer, "text", Columns.DISPLAY_NAME);
+ appColumn.add_attribute(nameRenderer, 'text', Columns.DISPLAY_NAME);
this._treeView.append_column(appColumn);
let workspaceColumn = new Gtk.TreeViewColumn({
- title: _("Workspace"),
+ title: _('Workspace'),
sort_column_id: Columns.WORKSPACE
});
let workspaceRenderer = new Gtk.CellRendererSpin({ editable: true });
workspaceRenderer.connect('edited', this._workspaceEdited.bind(this));
workspaceColumn.pack_start(workspaceRenderer, true);
- workspaceColumn.add_attribute(workspaceRenderer, "adjustment", Columns.ADJUSTMENT);
- workspaceColumn.add_attribute(workspaceRenderer, "text", Columns.WORKSPACE);
+ workspaceColumn.add_attribute(workspaceRenderer, 'adjustment', Columns.ADJUSTMENT);
+ workspaceColumn.add_attribute(workspaceRenderer, 'text', Columns.WORKSPACE);
this._treeView.append_column(workspaceColumn);
scrolled.add(this._treeView);
@@ -86,7 +86,7 @@ const Widget = GObject.registerClass({
let newButton = new Gtk.ToolButton({
icon_name: 'bookmark-new-symbolic',
- label: _("Add Rule"),
+ label: _('Add Rule'),
is_important: true
});
newButton.connect('clicked', this._createNew.bind(this));
@@ -108,13 +108,13 @@ const Widget = GObject.registerClass({
_createNew() {
let dialog = new Gtk.Dialog({
- title: _("Create new matching rule"),
+ title: _('Create new matching rule'),
transient_for: this.get_toplevel(),
use_header_bar: true,
modal: true
});
dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
- let addButton = dialog.add_button(_("Add"), Gtk.ResponseType.OK);
+ let addButton = dialog.add_button(_('Add'), Gtk.ResponseType.OK);
dialog.set_default_response(Gtk.ResponseType.OK);
let grid = new Gtk.Grid({
@@ -131,7 +131,7 @@ const Widget = GObject.registerClass({
grid.attach(dialog._appChooser, 0, 0, 2, 1);
grid.attach(new Gtk.Label({
- label: _("Workspace"),
+ label: _('Workspace'),
halign: Gtk.Align.END
}), 0, 1, 1, 1);
let adjustment = new Gtk.Adjustment({
diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js
index 47537f5..51b4aa6 100644
--- a/extensions/drive-menu/extension.js
+++ b/extensions/drive-menu/extension.js
@@ -97,7 +97,7 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
_reportFailure(exception) {
// TRANSLATORS: %s is the filesystem name
- let msg = _("Ejecting drive “%s” failed:").format(this.mount.get_name());
+ let msg = _('Ejecting drive “%s” failed:').format(this.mount.get_name());
Main.notifyError(msg, exception.message);
}
@@ -113,7 +113,7 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
let DriveMenu = GObject.registerClass(
class DriveMenu extends PanelMenu.Button {
_init() {
- super._init(0.0, _("Removable devices"));
+ super._init(0.0, _('Removable devices'));
let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
let icon = new St.Icon({
@@ -140,7 +140,7 @@ class DriveMenu extends PanelMenu.Button {
this._monitor.get_mounts().forEach(this._addMount.bind(this));
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
- this.menu.addAction(_("Open Files"), event => {
+ this.menu.addAction(_('Open Files'), event => {
let appSystem = Shell.AppSystem.get_default();
let app = appSystem.lookup_app('org.gnome.Nautilus.desktop');
app.activate_full(-1, event.get_time());
diff --git a/extensions/places-menu/extension.js b/extensions/places-menu/extension.js
index 11090e1..c477a4a 100644
--- a/extensions/places-menu/extension.js
+++ b/extensions/places-menu/extension.js
@@ -76,11 +76,11 @@ const SECTIONS = [
let PlacesMenu = GObject.registerClass(
class PlacesMenu extends PanelMenu.Button {
_init() {
- super._init(0.0, _("Places"));
+ super._init(0.0, _('Places'));
let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
let label = new St.Label({
- text: _("Places"),
+ text: _('Places'),
y_expand: true,
y_align: Clutter.ActorAlign.CENTER
});
diff --git a/extensions/places-menu/placeDisplay.js b/extensions/places-menu/placeDisplay.js
index 79d401d..037a339 100644
--- a/extensions/places-menu/placeDisplay.js
+++ b/extensions/places-menu/placeDisplay.js
@@ -56,7 +56,7 @@ class PlaceInfo {
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
// e.g. user canceled the password dialog
return;
- Main.notifyError(_("Failed to mount volume for “%s”").format(this.name),
e.message);
+ Main.notifyError(_('Failed to mount volume for “%s”').format(this.name),
e.message);
return;
}
@@ -69,7 +69,7 @@ class PlaceInfo {
}
});
} else {
- Main.notifyError(_("Failed to launch “%s”").format(this.name), e.message);
+ Main.notifyError(_('Failed to launch “%s”').format(this.name), e.message);
}
}
};
@@ -130,7 +130,7 @@ Signals.addSignalMethods(PlaceInfo.prototype);
class RootInfo extends PlaceInfo {
_init() {
- super._init('devices', Gio.File.new_for_path('/'), _("Computer"));
+ super._init('devices', Gio.File.new_for_path('/'), _('Computer'));
let busName = 'org.freedesktop.hostname1';
let objPath = '/org/freedesktop/hostname1';
@@ -153,7 +153,7 @@ class RootInfo extends PlaceInfo {
// GDBusProxy will emit a g-properties-changed when hostname1 goes down
// ignore it
if (proxy.g_name_owner) {
- this.name = proxy.PrettyHostname || _("Computer");
+ this.name = proxy.PrettyHostname || _('Computer');
this.emit('changed');
}
}
@@ -214,7 +214,7 @@ class PlaceDeviceInfo extends PlaceInfo {
}
_reportFailure(exception) {
- let msg = _("Ejecting drive “%s” failed:").format(this._mount.get_name());
+ let msg = _('Ejecting drive “%s” failed:').format(this._mount.get_name());
Main.notifyError(msg, exception.message);
}
}
@@ -340,7 +340,7 @@ var PlacesManager = class {
this._places.special.push(new PlaceInfo('special',
Gio.File.new_for_path(homePath),
- _("Home")));
+ _('Home')));
let specials = [];
let dirs = DEFAULT_DIRECTORIES.slice();
@@ -384,7 +384,7 @@ var PlacesManager = class {
this._places.devices.push(new RootInfo());
this._places.network.push(new PlaceInfo('network',
Gio.File.new_for_uri('network:///'),
- _("Browse Network"),
+ _('Browse Network'),
'network-workgroup-symbolic'));
/* first go through all connected drives */
diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js
index 24cd233..9e2ee94 100644
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
@@ -97,7 +97,7 @@ class WindowContextMenu extends PopupMenu.PopupMenu {
this._updateMaximizeItem.bind(this));
this._updateMaximizeItem();
- this._closeItem = new PopupMenu.PopupMenuItem(_("Close"));
+ this._closeItem = new PopupMenu.PopupMenuItem(_('Close'));
this._closeItem.connect('activate', () => {
this._metaWindow.delete(global.get_current_time());
});
@@ -117,14 +117,14 @@ class WindowContextMenu extends PopupMenu.PopupMenu {
_updateMinimizeItem() {
this._minimizeItem.label.text = this._metaWindow.minimized ?
- _("Unminimize") : _("Minimize");
+ _('Unminimize') : _('Minimize');
}
_updateMaximizeItem() {
let maximized = this._metaWindow.maximized_vertically &&
this._metaWindow.maximized_horizontally;
this._maximizeItem.label.text = maximized ?
- _("Unmaximize") : _("Maximize");
+ _('Unmaximize') : _('Maximize');
}
_onDestroy() {
@@ -405,19 +405,19 @@ class AppContextMenu extends PopupMenu.PopupMenu {
this._appButton = appButton;
- this._minimizeItem = new PopupMenu.PopupMenuItem(_("Minimize all"));
+ this._minimizeItem = new PopupMenu.PopupMenuItem(_('Minimize all'));
this._minimizeItem.connect('activate', () => {
this._appButton.getWindowList().forEach(w => w.minimize());
});
this.addMenuItem(this._minimizeItem);
- this._unminimizeItem = new PopupMenu.PopupMenuItem(_("Unminimize all"));
+ this._unminimizeItem = new PopupMenu.PopupMenuItem(_('Unminimize all'));
this._unminimizeItem.connect('activate', () => {
this._appButton.getWindowList().forEach(w => w.unminimize());
});
this.addMenuItem(this._unminimizeItem);
- this._maximizeItem = new PopupMenu.PopupMenuItem(_("Maximize all"));
+ this._maximizeItem = new PopupMenu.PopupMenuItem(_('Maximize all'));
this._maximizeItem.connect('activate', () => {
this._appButton.getWindowList().forEach(w => {
w.maximize(Meta.MaximizeFlags.HORIZONTAL |
@@ -426,7 +426,7 @@ class AppContextMenu extends PopupMenu.PopupMenu {
});
this.addMenuItem(this._maximizeItem);
- this._unmaximizeItem = new PopupMenu.PopupMenuItem(_("Unmaximize all"));
+ this._unmaximizeItem = new PopupMenu.PopupMenuItem(_('Unmaximize all'));
this._unmaximizeItem.connect('activate', () => {
this._appButton.getWindowList().forEach(w => {
w.unmaximize(Meta.MaximizeFlags.HORIZONTAL |
@@ -435,7 +435,7 @@ class AppContextMenu extends PopupMenu.PopupMenu {
});
this.addMenuItem(this._unmaximizeItem);
- let item = new PopupMenu.PopupMenuItem(_("Close all"));
+ let item = new PopupMenu.PopupMenuItem(_('Close all'));
item.connect('activate', () => {
this._appButton.getWindowList().forEach(w => {
w.delete(global.get_current_time());
@@ -652,7 +652,7 @@ class AppButton extends BaseButton {
let WorkspaceIndicator = GObject.registerClass(
class WorkspaceIndicator extends PanelMenu.Button {
_init() {
- super._init(0.0, _("Workspace Indicator"), true);
+ super._init(0.0, _('Workspace Indicator'), true);
this.setMenu(new PopupMenu.PopupMenu(this, 0.0, St.Side.BOTTOM));
this.add_style_class_name('window-list-workspace-indicator');
this.menu.actor.remove_style_class_name('panel-menu');
@@ -833,7 +833,7 @@ class WindowList {
trackFullscreen: true
});
Main.uiGroup.set_child_above_sibling(this.actor, Main.layoutManager.panelBox);
- Main.ctrlAltTabManager.addGroup(this.actor, _("Window List"), 'start-here-symbolic');
+ Main.ctrlAltTabManager.addGroup(this.actor, _('Window List'), 'start-here-symbolic');
this.actor.width = this._monitor.width;
this.actor.connect('notify::height', this._updatePosition.bind(this));
diff --git a/extensions/window-list/prefs.js b/extensions/window-list/prefs.js
index 3c2960a..78792b5 100644
--- a/extensions/window-list/prefs.js
+++ b/extensions/window-list/prefs.js
@@ -22,7 +22,7 @@ class WindowListPrefsWidget extends Gtk.Grid {
this.row_spacing = 6;
this.orientation = Gtk.Orientation.VERTICAL;
- let groupingLabel = '<b>%s</b>'.format(_("Window Grouping"));
+ let groupingLabel = '<b>%s</b>'.format(_('Window Grouping'));
this.add(new Gtk.Label({
label: groupingLabel, use_markup: true,
halign: Gtk.Align.START
@@ -44,9 +44,9 @@ class WindowListPrefsWidget extends Gtk.Grid {
let modes = range.deep_unpack()[1].deep_unpack();
let modeLabels = {
- 'never': _("Never group windows"),
- 'auto': _("Group windows when space is limited"),
- 'always': _("Always group windows")
+ 'never': _('Never group windows'),
+ 'auto': _('Group windows when space is limited'),
+ 'always': _('Always group windows')
};
let radio = null;
@@ -72,7 +72,7 @@ class WindowListPrefsWidget extends Gtk.Grid {
}
let check = new Gtk.CheckButton({
- label: _("Show on all monitors"),
+ label: _('Show on all monitors'),
margin_top: 6
});
this._settings.bind('show-on-all-monitors', check, 'active', Gio.SettingsBindFlags.DEFAULT);
diff --git a/extensions/workspace-indicator/extension.js b/extensions/workspace-indicator/extension.js
index 38ed870..3be1268 100644
--- a/extensions/workspace-indicator/extension.js
+++ b/extensions/workspace-indicator/extension.js
@@ -18,7 +18,7 @@ const WORKSPACE_KEY = 'workspace-names';
let WorkspaceIndicator = GObject.registerClass(
class WorkspaceIndicator extends PanelMenu.Button {
_init() {
- super._init(0.0, _("Workspace Indicator"));
+ super._init(0.0, _('Workspace Indicator'));
let workspaceManager = global.workspace_manager;
diff --git a/extensions/workspace-indicator/prefs.js b/extensions/workspace-indicator/prefs.js
index ed5c478..d864055 100644
--- a/extensions/workspace-indicator/prefs.js
+++ b/extensions/workspace-indicator/prefs.js
@@ -128,7 +128,7 @@ class WorkspaceSettingsWidget extends Gtk.Grid {
this.orientation = Gtk.Orientation.VERTICAL;
this.add(new Gtk.Label({
- label: '<b>%s</b>'.format(_("Workspace Names")),
+ label: '<b>%s</b>'.format(_('Workspace Names')),
use_markup: true,
margin_bottom: 6,
hexpand: true,
@@ -148,7 +148,7 @@ class WorkspaceSettingsWidget extends Gtk.Grid {
vexpand: true
});
- let column = new Gtk.TreeViewColumn({ title: _("Name") });
+ let column = new Gtk.TreeViewColumn({ title: _('Name') });
let renderer = new Gtk.CellRendererText({ editable: true });
renderer.connect('edited', this._cellEdited.bind(this));
column.pack_start(renderer, true);
@@ -188,7 +188,7 @@ class WorkspaceSettingsWidget extends Gtk.Grid {
let iter = this._store.append();
let index = this._store.get_path(iter).get_indices()[0];
- let label = _("Workspace %d").format(index + 1);
+ let label = _('Workspace %d').format(index + 1);
this._store.set(iter, [this._store.Columns.LABEL], [label]);
}
diff --git a/lint/eslintrc-legacy.json b/lint/eslintrc-legacy.json
index 1c57f08..aca79ad 100644
--- a/lint/eslintrc-legacy.json
+++ b/lint/eslintrc-legacy.json
@@ -11,7 +11,6 @@
"CallExpression": { "arguments": "first" },
"MemberExpression": "off"
}
- ],
- "quotes": "off"
+ ]
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
