Remove all references to localedir from metadata.json

It is not used anymore, now that translations are bundled with
the extension. Also, in the zip files it ended up with my home
folder, which is not nice.

Cherry-picked from master, added code to load translation from
within the extension folder.
This commit is contained in:
Giovanni Campagna
2011-11-20 00:40:20 +01:00
parent da622f3f61
commit c4b40926bd
22 changed files with 12 additions and 26 deletions
+1 -2
View File
@@ -6,8 +6,7 @@ nodist_extension_DATA = metadata.json $(EXTRA_EXTENSION)
EXTRA_DIST = metadata.json.in
metadata.json: metadata.json.in $(top_builddir)/config.status
$(AM_V_GEN) sed -e "s|[@]LOCALEDIR@|$(datadir)/locale|" \
-e "s|[@]uuid@|$(uuid)|" \
$(AM_V_GEN) sed -e "s|[@]uuid@|$(uuid)|" \
-e "s|[@]shell_current@|$(PACKAGE_VERSION)|" \
-e "s|[@]url@|$(extensionurl)|" $< > $@
+1 -1
View File
@@ -595,7 +595,7 @@ WindowList.prototype = {
};
function init(metadata) {
imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
}
function doAltTab(shellwm, binding, mask, window, backwards) {
@@ -4,6 +4,5 @@
"description": "A replacement for Alt-Tab, allows to cycle between windows and does not group by application",
"original-authors": [ "jw@bargsten.org", "thomas.bouffon@gmail.com" ],
"shell-version": [ "@shell_current@", "3.2" ],
"localedir": "@LOCALEDIR@",
"url": "@url@"
}
@@ -1,4 +1,5 @@
/* -*- mode: js2 - indent-tabs-mode: nil - js2-basic-offset: 4 -*- */
const GLib = imports.gi.GLib;
const Lang = imports.lang;
const St = imports.gi.St;
@@ -99,7 +100,7 @@ function createSubMenu() {
// Put your extension initialization code here
function init(metadata) {
imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
}
function reset(statusMenu) {
@@ -126,4 +127,4 @@ function disable() {
statusMenu.menu.removeAll();
statusMenu._createSubMenu();
reset(statusMenu);
}
}
@@ -3,6 +3,5 @@
"name": "Alternative Status Menu",
"description": "Replaces GNOME Shell Status Menu with one showing Suspend/Hibernate and Power Off as separate items",
"shell-version": [ "@shell_current@", "3.2" ],
"localedir": "@LOCALEDIR@",
"url": "@url@"
}
-1
View File
@@ -3,6 +3,5 @@
"name": "Applications Menu",
"description": "Add a gnome 2.x style menu for applications",
"shell-version": [ "@shell_current@", "3.2" ],
"localedir": "@LOCALEDIR@",
"url": "@url@"
}
@@ -3,7 +3,6 @@
"name": "Auto Move Windows",
"description": "Move applications to specific workspaces when they create windows",
"shell-version": [ "@shell_current@", "3.2" ],
"localedir": "@LOCALEDIR@",
"original-authors": [ "alessandro.crismani@gmail.com", "thomas.bouffon@gmail.com" ],
"url": "@url@"
}
+1 -1
View File
@@ -935,7 +935,7 @@ DockIconMenu.prototype = {
}
function init(extensionMeta) {
imports.gettext.bindtextdomain('gnome-shell-extensions', extensionMeta.localedir);
imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
}
let dock;
-1
View File
@@ -4,6 +4,5 @@
"description": "A dock for the GNOME Shell -- displays favorite and running applications",
"original-author": "tclaesson@gmail.com",
"shell-version": [ "@shell_current@", "3.2" ],
"localedir": "@LOCALEDIR@",
"url": "@url@"
}
+1 -1
View File
@@ -91,7 +91,7 @@ DriveMenu.prototype = {
// Put your extension initialization code here
function init(metadata) {
imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
}
let _indicator;
-1
View File
@@ -3,6 +3,5 @@
"name": "Removable Drive Menu",
"description": "A status menu for accessing and unmounting removable devices",
"shell-version": [ "@shell_current@", "3.2" ],
"localedir": "@LOCALEDIR@",
"url": "@url@"
}
+2 -2
View File
@@ -19,7 +19,7 @@ function _showHello() {
function init(metadata) {
log ('Example extension initalized');
imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
}
let signalId;
@@ -38,4 +38,4 @@ function disable() {
Main.panel.actor.disconnect(signalId);
signalId = 0;
}
}
}
-1
View File
@@ -3,6 +3,5 @@
"name": "Hello, World!",
"description": "An example extension to show how it works. Shows Hello, world when clicking on the top panel.",
"shell-version": [ "@shell_current@", "3.2" ],
"localedir": "@LOCALEDIR@",
"url": "@url@"
}
-1
View File
@@ -3,6 +3,5 @@
"name": "Gajim IM integration",
"description": "Display Gajim incoming chats as notifications in the Shell message tray.",
"shell-version": [ "@shell_current@", "3.2" ],
"localedir": "@LOCALEDIR@",
"url": "http://base-art.net"
}
@@ -3,7 +3,6 @@
"name": "Native Window Placement",
"description": "Arrange windows in overview in a more native way",
"shell-version": [ "@shell_current@", "3.2" ],
"localedir": "@LOCALEDIR@",
"url": "@url@",
"original-authors": [ "wepmaschda@gmx.de" ]
}
+1 -1
View File
@@ -114,7 +114,7 @@ PlacesMenu.prototype = {
function init(metadata) {
imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
}
let _indicator;
-1
View File
@@ -3,6 +3,5 @@
"name": "Places Status Indicator",
"description": "Add a systems status menu for quickly navigating places in the system",
"shell-version": [ "@shell_current@", "3.2" ],
"localedir": "@LOCALEDIR@",
"url": "@url@"
}
@@ -1,7 +1,6 @@
{
"shell-version": ["@shell_current@", "3.2" ],
"uuid": "@uuid@",
"localedir": "@LOCALEDIR@",
"original-author": "zaspire@rambler.ru",
"name": "SystemMonitor",
"description": "System Monitor",
@@ -1,7 +1,6 @@
{
"shell-version": ["@shell_current@", "3.2" ],
"uuid": "@uuid@",
"localedir": "@LOCALEDIR@",
"original-author": "zaspire@rambler.ru",
"name": "windowNavigator",
"description": "Allow keyboard selection of windows and workspaces in overlay mode",
@@ -3,7 +3,6 @@
"name": "Workspace Indicator",
"description": "Put an indicator on the panel signaling in which workspace you are, and give you the possibility of switching to another one",
"shell-version": [ "@shell_current@", "3.2" ],
"localedir": "@LOCALEDIR@",
"original-authors": [ "erick.red@gmail.com" ],
"url": "@url@"
}
+2 -2
View File
@@ -137,7 +137,7 @@ Indicator.prototype = {
function init(metadata) {
imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
}
let _indicator;
@@ -149,4 +149,4 @@ function enable() {
function disable() {
_indicator.destroy();
}
}
@@ -3,6 +3,5 @@
"name": "Monitor Status Indicator",
"description": "Add a systems status menu for rotating monitors (overrides what is currently provided by gnome-settings-daemon)",
"shell-version": [ "@shell_current@", "3.2" ],
"localedir": "@LOCALEDIR@",
"url": "@url@"
}