GNOME.org
 

[gedit] Made plugin schemas translatable

commit 6d60dc4882eb41cbcccbd514d3829c67fffc3201
Author: Garrett Regier <alias301 gmail com>
Date:   Thu May 20 02:28:51 2010 -0700

    Made plugin schemas translatable
    
    This also fixes bug 613461.

 configure.ac                                       |    3 +
 data/Makefile.am                                   |    3 -
 plugins/checkupdate/Makefile.am                    |    5 ++-
 .../org.gnome.gedit.checkupdate.gschema.xml        |    7 ---
 .../org.gnome.gedit.checkupdate.gschema.xml.in.in  |   10 ++++
 plugins/filebrowser/Makefile.am                    |    4 +-
 .../org.gnome.gedit.file-browser.gschema.xml       |   41 ---------------
 .../org.gnome.gedit.file-browser.gschema.xml.in.in |   55 ++++++++++++++++++++
 plugins/time/Makefile.am                           |   11 ++---
 plugins/time/org.gnome.gedit.time.gschema.in       |    6 --
 .../time/org.gnome.gedit.time.gschema.xml.in.in    |   19 +++++++
 po/POTFILES.in                                     |    3 +
 tests/Makefile.am                                  |    2 +
 13 files changed, 103 insertions(+), 66 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 90c316f..4b4c9bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -548,12 +548,14 @@ plugin-loaders/python/Makefile
 plugin-loaders/python/bindings/Makefile
 plugins/Makefile
 plugins/changecase/Makefile
+plugins/checkupdate/org.gnome.gedit.checkupdate.gschema.xml.in
 plugins/checkupdate/Makefile
 plugins/docinfo/Makefile
 plugins/externaltools/data/Makefile
 plugins/externaltools/Makefile
 plugins/externaltools/scripts/Makefile
 plugins/externaltools/tools/Makefile
+plugins/filebrowser/org.gnome.gedit.file-browser.gschema.xml.in
 plugins/filebrowser/Makefile
 plugins/modelines/Makefile
 plugins/pythonconsole/Makefile
@@ -567,6 +569,7 @@ plugins/snippets/snippets/Makefile
 plugins/sort/Makefile
 plugins/spell/Makefile
 plugins/taglist/Makefile
+plugins/time/org.gnome.gedit.time.gschema.xml.in
 plugins/time/Makefile
 po/Makefile.in
 tests/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 740ae6a..49bc8a1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -42,7 +42,4 @@ CLEANFILES =	 			\
 	$(service_DATA)			\
 	$(pkgconfig_DATA)
 
-
-
-
 -include $(top_srcdir)/git.mk
diff --git a/plugins/checkupdate/Makefile.am b/plugins/checkupdate/Makefile.am
index ebbb8f3..69fba3d 100644
--- a/plugins/checkupdate/Makefile.am
+++ b/plugins/checkupdate/Makefile.am
@@ -25,13 +25,16 @@ plugin_in_files = checkupdate.gedit-plugin.desktop.in
 plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
 
 gsettingsschema_DATA = org.gnome.gedit.checkupdate.gschema.xml
+ INTLTOOL_XML_NOMERGE_RULE@
 
 if GSETTINGS_SCHEMAS_INSTALL
 install-data-hook:
 	$(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
 endif
 
-EXTRA_DIST = $(plugin_in_files)
+EXTRA_DIST = \
+	$(plugin_in_files)	\
+	$(gsettingsschema_DATA)
 
 CLEANFILES = $(plugin_DATA)
 
diff --git a/plugins/checkupdate/org.gnome.gedit.checkupdate.gschema.xml.in.in b/plugins/checkupdate/org.gnome.gedit.checkupdate.gschema.xml.in.in
new file mode 100644
index 0000000..abbb326
--- /dev/null
+++ b/plugins/checkupdate/org.gnome.gedit.checkupdate.gschema.xml.in.in
@@ -0,0 +1,10 @@
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.checkupdate" path="/apps/gedit/plugins/checkupdate">
+    <key name="ignore-version" type="s">
+      <default>''</default>
+      <_summary>Version to Ignore</_summary>
+      <!-- This is releated to the next gedit version to be released -->
+      <_description>Version to ignore until a newer version is released.</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/plugins/filebrowser/Makefile.am b/plugins/filebrowser/Makefile.am
index 657c396..6411fe5 100644
--- a/plugins/filebrowser/Makefile.am
+++ b/plugins/filebrowser/Makefile.am
@@ -66,6 +66,7 @@ gedit-file-browser-marshal.c: gedit-file-browser-marshal.list $(GLIB_GENMARSHAL)
 plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
 
 gsettingsschema_DATA = org.gnome.gedit.file-browser.gschema.xml
+ INTLTOOL_XML_NOMERGE_RULE@
 
 if GSETTINGS_SCHEMAS_INSTALL
 install-data-hook:
@@ -78,7 +79,8 @@ EXTRA_DIST = \
 	gedit-file-browser-enum-types.h.template	\
 	gedit-file-browser-enum-types.c.template	\
 	gedit-file-browser-enum-register.c.template	\
-	gedit-file-browser-marshal.list
+	gedit-file-browser-marshal.list			\
+	$(gsettingsschema_DATA)
 
 CLEANFILES = \
 	$(plugin_DATA)		\
diff --git a/plugins/filebrowser/org.gnome.gedit.file-browser.gschema.xml.in.in b/plugins/filebrowser/org.gnome.gedit.file-browser.gschema.xml.in.in
new file mode 100644
index 0000000..483367c
--- /dev/null
+++ b/plugins/filebrowser/org.gnome.gedit.file-browser.gschema.xml.in.in
@@ -0,0 +1,55 @@
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.filebrowser" path="/apps/gedit/plugins/filebrowser/">
+    <key name="tree-view" type="b">
+      <default>true</default>
+      <_summary>Open With Tree View</_summary>
+      <_description>Open the tree view when the file browser plugin gets loaded instead of the bookmarks view</_description>
+    </key>
+    <key name="root" type="s">
+      <default>''</default>
+      <_summary>File Browser Root Directory</_summary>
+      <_description>The file browser root directory to use when loading the file browser plugin and onload/tree_view is TRUE.</_description>
+    </key>
+    <key name="virtual-root" type="s">
+      <default>''</default>
+      <_summary>File Browser Virtual Root Directory</_summary>
+      <_description>The file browser virtual root directory to use when loading the file browser plugin when onload/tree_view is TRUE. The virtual root must always be below the actual root.</_description>
+    </key>
+    <key name="enable-remote" type="b">
+      <default>false</default>
+      <_summary>Enable Restore of Remote Locations</_summary>
+      <_description>Sets whether to enable restoring of remote locations.</_description>
+    </key>
+    <key name="open-at-first-doc" type="b">
+      <default>true</default>
+      <_summary>Set Location to First Document</_summary>
+      <_description>If TRUE the file browser plugin will view the directory of the first opened document given that the file browser hasn't been used yet. (Thus this generally applies to opening a document from the command line or opening it with Nautilus, etc.)</_description>
+    </key>
+    <key name="filter-mode" type="s">
+      <default>'hidden-and-binary'</default>
+      <_summary>File Browser Filter Mode</_summary>
+      <_description>This value determines what files get filtered from the file browser. Valid values are: none (filter nothing), hidden (filter hidden files), binary (filter binary files) and hidden_and_binary (filter both hidden and binary files).</_description>
+    </key>
+    <key name="filter-pattern" type="s">
+      <default>''</default>
+      <_summary>File Browser Filter Pattern</_summary>
+      <_description>The filter pattern to filter the file browser with. This filter works on top of the filter_mode.</_description>
+    </key>
+  </schema>
+  <schema id="org.gnome.Desktop.Applications.Terminal" path="/desktop/gnome/applications/terminal/">
+    <key name="exec" type="s">
+      <default>'gnome-terminal'</default>
+    </key>
+  </schema>
+  <schema id="org.gnome.Nautilus.preferences" path="/apps/nautilus/preferences/">
+    <key name="click-policy" type="s">
+      <default>'double'</default>
+    </key>
+    <key name="enable-delete" type="b">
+      <default>false</default>
+    </key>
+    <key name="confirm-trash" type="b">
+      <default>true</default>
+    </key>
+  </schema>
+</schemalist>
diff --git a/plugins/time/Makefile.am b/plugins/time/Makefile.am
index f935a66..7b128e2 100644
--- a/plugins/time/Makefile.am
+++ b/plugins/time/Makefile.am
@@ -16,11 +16,6 @@ libtime_la_SOURCES = \
 libtime_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libtime_la_LIBADD  = $(GEDIT_LIBS)
 
-gsettingsschema_in_files = org.gnome.gedit.time.gschema.in
-gsettingsschema_DATA = $(gsettingsschema_in_files:.gschema.in=.gschema.xml)
-org.gnome.gedit.time.gschema.xml: org.gnome.gedit.time.gschema.in
-	gsettings-schema-convert -f $< -o $@
-
 uidir = $(GEDIT_PLUGINS_DATA_DIR)/time
 ui_DATA = \
 	gedit-time-dialog.ui				\
@@ -32,15 +27,17 @@ plugin_in_files = time.gedit-plugin.desktop.in
 
 plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
 
+gsettingsschema_DATA = org.gnome.gedit.time.gschema.xml
+ INTLTOOL_XML_NOMERGE_RULE@
+
 if GSETTINGS_SCHEMAS_INSTALL
 install-data-hook:
 	$(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
 endif
 
-EXTRA_DIST = $(ui_DATA) $(plugin_in_files)
+EXTRA_DIST = $(ui_DATA) $(plugin_in_files) $(gsettingsschema_DATA)
 
 CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
 
-
 -include $(top_srcdir)/git.mk
diff --git a/plugins/time/org.gnome.gedit.time.gschema.xml.in.in b/plugins/time/org.gnome.gedit.time.gschema.xml.in.in
new file mode 100644
index 0000000..6fd1d66
--- /dev/null
+++ b/plugins/time/org.gnome.gedit.time.gschema.xml.in.in
@@ -0,0 +1,19 @@
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.time" path="/apps/gedit/plugins/time/">
+    <key name="prompt-type" type="s">
+      <default>'USE_SELECTED_FORMAT'</default>
+      <_summary>Prompt Type</_summary>
+      <_description>If the user should be prompted for a format of if the selected or custom format should be used.</_description>
+    </key>
+    <key name="selected-format" type="s">
+      <default>''</default>
+      <_summary>Selected Format</_summary>
+      <_description>The selected format used when inserting the date/time.</_description>
+    </key>
+    <key name="custom-format" type="s">
+      <default>''</default>
+      <_summary>Custom Format</_summary>
+      <_description>The custom format used when inserting the date/time.</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bd4d564..a790f98 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -45,6 +45,7 @@ plugins/changecase/changecase.gedit-plugin.desktop.in
 plugins/changecase/gedit-changecase-plugin.c
 plugins/checkupdate/checkupdate.gedit-plugin.desktop.in
 plugins/checkupdate/gedit-check-update-plugin.c
+plugins/checkupdate/org.gnome.gedit.checkupdate.gschema.xml.in.in
 plugins/docinfo/docinfo.gedit-plugin.desktop.in
 [type: gettext/glade]plugins/docinfo/docinfo.ui
 plugins/docinfo/gedit-docinfo-plugin.c
@@ -67,6 +68,7 @@ plugins/filebrowser/gedit-file-browser-plugin.c
 plugins/filebrowser/gedit-file-browser-store.c
 plugins/filebrowser/gedit-file-browser-view.c
 plugins/filebrowser/gedit-file-browser-widget.c
+plugins/filebrowser/org.gnome.gedit.filebrowser.gschema.xml.in.in
 plugins/modelines/modelines.gedit-plugin.desktop.in
 plugins/pythonconsole/pythonconsole.gedit-plugin.desktop.in
 plugins/pythonconsole/pythonconsole/__init__.py
@@ -104,5 +106,6 @@ plugins/taglist/XSLT.tags.xml.in
 plugins/taglist/XUL.tags.xml.in
 plugins/time/gedit-time-plugin.c
 plugins/time/time.gedit-plugin.desktop.in
+plugins/time/org.gnome.gedit.time.gschema.xml.in.in
 [type: gettext/glade]plugins/time/gedit-time-dialog.ui
 [type: gettext/glade]plugins/time/gedit-time-setup-dialog.ui
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f54ce8c..e4cd496 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,3 +26,5 @@ document_saver_LDADD		= $(progs_ldadd)
 TESTS = $(TEST_PROGS)
 
 EXTRA_DIST = setup-document-saver.sh
+
+-include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]