summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorErnestas Kulik <ernestask@src.gnome.org>2016-08-02 12:24:24 +0300
committerErnestas Kulik <ernestask@src.gnome.org>2016-08-03 10:42:40 +0300
commitfc2139c117d43e42ce4802370560ac279ea2cebd (patch)
tree0e33ae43f451a3f26e88060dde1aec6f15446ddc /src
parentc76cace9e60f40648c7bb25879399451dbed2894 (diff)
downloadnautilus-fc2139c117d43e42ce4802370560ac279ea2cebd.tar.gz
Port from intltool
gettext has been continuously improving, up to a point where intltool can be deprecated in favor of it. This commit ports the project files to use upstream gettext. https://bugzilla.gnome.org/show_bug.cgi?id=769362
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am3
-rw-r--r--src/nautilus-autorun-software.c2
-rw-r--r--src/nautilus-main.c2
3 files changed, 3 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 1aa60645e..7238e57c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,6 +21,7 @@ AM_CPPFLAGS = \
$(TRACKER_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\" \
+ -DLOCALEDIR=\""$(localedir)"\" \
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
-DNAUTILUS_EXTENSIONDIR=\""$(libdir)/nautilus/extensions-3.0"\" \
-DPREFIX=\""$(prefix)"\" \
@@ -376,8 +377,6 @@ BUILT_SOURCES = \
TESTS=check-nautilus
-@INTLTOOL_SERVER_RULE@
-
CLEANFILES = \
$(BUILT_SOURCES) \
$(server_DATA) \
diff --git a/src/nautilus-autorun-software.c b/src/nautilus-autorun-software.c
index 8720daa6f..cfe528eea 100644
--- a/src/nautilus-autorun-software.c
+++ b/src/nautilus-autorun-software.c
@@ -254,7 +254,7 @@ main (int argc, char *argv[])
GMount *mount;
GError *error;
- bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index 511cfdad0..e54d5ad39 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -79,7 +79,7 @@ main (int argc, char *argv[])
}
/* Initialize gettext support */
- bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);