GNOME.org
 

[gedit-plugins] Fix translation of plugins metainfo

commit a8cfb02a87c3bd634152b9b944f41d186d582b3b
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Thu Sep 28 12:02:40 2017 -0500

    Fix translation of plugins metainfo
    
    It's not translated because INTLTOOL_XML_NOMERGE_RULE is used, but the
    metainfo files require that the translations be merged into them. So
    switch to normal INTLTOOL_XML_RULE.
    
    Now, gedit-plugins was relying on INTLTOOL_XML_NOMERGE_RULE for its
    GSettings translation support. This is pointless as intltool has had
    GSettings support since 2012. Rely on it. This avoids the problem that
    you can't use both the merge rule and the nomerge rule in the same
    Makefile.am.
    
    gedit-plugins should really not be using intltool at all anymore. It's
    obsolete. Switching is not hard, but I'm not going to fix that today.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=788134

 configure.ac                                       |    5 +-
 plugins/Makefile.am                                |   10 +--
 ...org.gnome.gedit.plugins.drawspaces.gschema.xml} |   10 +-
 plugins/terminal/Makefile.am                       |    1 -
 ...> org.gnome.gedit.plugins.terminal.gschema.xml} |   90 ++++++++++----------
 ... org.gnome.gedit.plugins.translate.gschema.xml} |    2 +-
 ....gnome.gedit.plugins.wordcompletion.gschema.xml |   15 +++
 ....gedit.plugins.wordcompletion.gschema.xml.in.in |   15 ---
 8 files changed, 71 insertions(+), 77 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 356631d..5ccfac3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ esac
 AC_MSG_RESULT([$platform_win32])
 AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
 
-IT_PROG_INTLTOOL([0.40.0])
+IT_PROG_INTLTOOL([0.50.2])
 
 AM_GNU_GETTEXT_VERSION([0.17])
 AM_GNU_GETTEXT([external])
@@ -317,18 +317,15 @@ plugins/colorschemer/colorschemer.plugin.desktop.in
 plugins/commander/commander.plugin.desktop.in
 plugins/dashboard/dashboard.plugin.desktop.in
 plugins/drawspaces/drawspaces.plugin.desktop.in
-plugins/drawspaces/org.gnome.gedit.plugins.drawspaces.gschema.xml.in
 plugins/findinfiles/findinfiles.plugin.desktop.in
 plugins/git/git.plugin.desktop.in
 plugins/joinlines/joinlines.plugin.desktop.in
 plugins/multiedit/multiedit.plugin.desktop.in
 plugins/smartspaces/smartspaces.plugin.desktop.in
 plugins/synctex/synctex.plugin.desktop.in
-plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in
 plugins/terminal/terminal.plugin.desktop.in
 plugins/textsize/textsize.plugin.desktop.in
 plugins/translate/translate.plugin.desktop.in
-plugins/wordcompletion/org.gnome.gedit.plugins.wordcompletion.gschema.xml.in
 plugins/wordcompletion/wordcompletion.plugin.desktop.in
 po/Makefile.in])
 
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 0be7135..df0cd03 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -11,7 +11,6 @@ appstreamdir = $(datadir)/appdata/
 appstream_in_files =
 dist_appstream_in_files =
 gsettings_SCHEMAS =
-dist_gsettings_SCHEMAS =
 
 include plugins/bookmarks/Makefile.am
 include plugins/bracketcompletion/Makefile.am
@@ -34,7 +33,8 @@ include plugins/translate/Makefile.am
 include plugins/wordcompletion/Makefile.am
 include plugins/zeitgeist/Makefile.am
 
-@INTLTOOL_XML_NOMERGE_RULE@
+@INTLTOOL_DESKTOP_RULE@
+@INTLTOOL_XML_RULE@
 @GSETTINGS_RULES@
 
 %.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) 
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
@@ -54,8 +54,7 @@ DISTCLEANFILES +=                     \
 
 CLEANFILES +=                          \
        $(GENERATED_PLUGIN_FILES)       \
-       $(GENERATED_APPSTREAM_FILES)    \
-       $(gsettings_SCHEMAS)
+       $(GENERATED_APPSTREAM_FILES)
 
 EXTRA_DIST +=                                                          \
        plugins/gpdefs.py.in                                            \
@@ -63,5 +62,4 @@ EXTRA_DIST +=                                                         \
        $(dist_plugin_in_files)                                         \
        $(appstream_in_files)                                           \
        $(dist_appstream_in_files)                                      \
-       $(gsettings_SCHEMAS:%.gschema.xml=%.gschema.xml.in.in)          \
-       $(dist_gsettings_SCHEMAS:%.gschema.xml=%.gschema.xml.in.in)
+       $(gsettings_SCHEMAS)
diff --git a/plugins/drawspaces/org.gnome.gedit.plugins.drawspaces.gschema.xml.in.in 
b/plugins/drawspaces/org.gnome.gedit.plugins.drawspaces.gschema.xml
similarity index 65%
rename from plugins/drawspaces/org.gnome.gedit.plugins.drawspaces.gschema.xml.in.in
rename to plugins/drawspaces/org.gnome.gedit.plugins.drawspaces.gschema.xml
index ca0d061..3b34536 100644
--- a/plugins/drawspaces/org.gnome.gedit.plugins.drawspaces.gschema.xml.in.in
+++ b/plugins/drawspaces/org.gnome.gedit.plugins.drawspaces.gschema.xml
@@ -9,16 +9,16 @@
     <value nick='trailing' value='64'/>
   </flags>
 
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.drawspaces" 
path="/org/gnome/gedit/plugins/drawspaces/">
+  <schema gettext-domain="gedit-plugins" id="org.gnome.gedit.plugins.drawspaces" 
path="/org/gnome/gedit/plugins/drawspaces/">
     <key name="show-white-space" type="b">
       <default>true</default>
-      <_summary>Show _White Space</_summary>
-      <_description>If TRUE drawing will be enabled.</_description>
+      <summary>Show _White Space</summary>
+      <description>If TRUE drawing will be enabled.</description>
     </key>
     <key name="draw-spaces" flags="org.gnome.gedit.plugins.drawspaces.GtkSourceDrawSpacesFlags">
       <default>['space', 'tab', 'leading', 'text', 'trailing']</default>
-      <_summary>Draw Spaces</_summary>
-      <_description>The type of spaces to be drawn.</_description>
+      <summary>Draw Spaces</summary>
+      <description>The type of spaces to be drawn.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/plugins/terminal/Makefile.am b/plugins/terminal/Makefile.am
index adc73a7..92ba82c 100644
--- a/plugins/terminal/Makefile.am
+++ b/plugins/terminal/Makefile.am
@@ -8,5 +8,4 @@ gsettings_SCHEMAS += plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.x
 else
 dist_plugin_in_files += plugins/terminal/terminal.plugin.desktop.in
 dist_appstream_in_files += plugins/terminal/gedit-terminal.metainfo.xml.in
-dist_gsettings_SCHEMAS += plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml
 endif
diff --git a/plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in 
b/plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml
similarity index 74%
rename from plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in
rename to plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml
index 8d62266..89a5ba0 100644
--- a/plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in
+++ b/plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml
@@ -10,76 +10,76 @@
     <value nick='underline' value='2'/>
   </enum>
 
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.terminal" 
path="/org/gnome/gedit/plugins/terminal/">
+  <schema gettext-domain="gedit-plugins" id="org.gnome.gedit.plugins.terminal" 
path="/org/gnome/gedit/plugins/terminal/">
     <key name="audible-bell" type="b">
       <default>true</default>
-      <_summary>Whether to silence terminal bell</_summary>
-      <_description>
+      <summary>Whether to silence terminal bell</summary>
+      <description>
         If true, don't make a noise when applications send the
         escape sequence for the terminal bell.
-      </_description>
+      </description>
     </key>
     <key name="scrollback-lines" type="i">
       <default>100</default>
-      <_summary>Number of lines to keep in scrollback</_summary>
-      <_description>
+      <summary>Number of lines to keep in scrollback</summary>
+      <description>
         Number of scrollback lines to keep around. You can
         scroll back in the terminal by this number of lines;
         lines that don't fit in the scrollback are discarded.
         If scrollback-unlimited is true, this value is ignored.
-      </_description>
+      </description>
     </key>
     <key name="scrollback-unlimited" type="b">
       <default>false</default>
-      <_summary>
+      <summary>
         Whether an unlimited number of lines should be kept in scrollback
-      </_summary>
-      <_description>
+      </summary>
+      <description>
         If true, scrollback lines will never be discarded.  The scrollback
         history is stored on disk temporarily, so this may cause the system
         to run out of disk space if there is a lot of output to the
         terminal.
-      </_description>
+      </description>
     </key>
     <key name="scroll-on-keystroke" type="b">
       <default>true</default>
-      <_summary>Whether to scroll to the bottom when a key is pressed</_summary>
-      <_description>
+      <summary>Whether to scroll to the bottom when a key is pressed</summary>
+      <description>
         If true, pressing a key jumps the scrollbar to the bottom.
-      </_description>
+      </description>
     </key>
     <key name="scroll-on-output" type="b">
       <default>false</default>
-      <_summary>Whether to scroll to the bottom when there's new output</_summary>
-      <_description>
+      <summary>Whether to scroll to the bottom when there's new output</summary>
+      <description>
         If true, whenever there's new output the terminal will scroll
         to the bottom.
-      </_description>
+      </description>
     </key>
     <key name="allow-bold" type="b">
       <default>true</default>
-      <_summary>Whether to allow bold text</_summary>
-      <_description>
+      <summary>Whether to allow bold text</summary>
+      <description>
         If true, allow applications in the terminal to make text boldface.
-      </_description>
+      </description>
     </key>
     <key name="foreground-color" type="s">
       <default>'#000000'</default>
-      <_summary>Default color of text in the terminal</_summary>
-      <_description>
+      <summary>Default color of text in the terminal</summary>
+      <description>
         Default color of text in the terminal, as a color
         specification (can be HTML-style hex digits, or
         a color name such as "red").
-      </_description>
+      </description>
     </key>
     <key name="background-color" type="s">
       <default>'#FFFFDD'</default>
-      <_summary>Default color of terminal background</_summary>
-      <_description>
+      <summary>Default color of terminal background</summary>
+      <description>
         Default color of terminal background, as a color
         specification (can be HTML-style hex digits, or
         a color name such as "red").
-      </_description>
+      </description>
     </key>
     <key name="palette" type="as">
       <default>["#2E2E34343636",
@@ -98,55 +98,55 @@
                 "#ADAD7F7FA8A8",
                 "#3434E2E2E2E2",
                 "#EEEEEEEEECEC"]</default>
-      <_summary>Palette for terminal applications</_summary>
-      <_description>
+      <summary>Palette for terminal applications</summary>
+      <description>
         Terminals have a 16-color palette that applications inside
         the terminal can use. This is that palette, in the form
         of a colon-separated list of color names. Color names
         should be in hex format e.g. "#FF00FF"
-      </_description>
+      </description>
     </key>
     <key name="use-theme-colors" type="b">
       <default>true</default>
-      <_summary>
+      <summary>
         Whether to use the colors from the theme for the terminal widget
-      </_summary>
-      <_description>
+      </summary>
+      <description>
         If true, the theme color scheme used for text entry boxes will
         be used for the terminal, instead of colors provided by the user.
-      </_description>
+      </description>
     </key>
     <key name="cursor-blink-mode" enum="org.gnome.gedit.plugins.terminal.VteTerminalCursorBlinkMode">
       <default>'system'</default>
-      <_summary>Whether to blink the cursor</_summary>
-      <_description>
+      <summary>Whether to blink the cursor</summary>
+      <description>
         The possible values are "system" to use the global cursor blinking
         settings, or "on" or "off" to set the mode explicitly.
-      </_description>
+      </description>
     </key>
     <key name="cursor-shape" enum="org.gnome.gedit.plugins.terminal.VteTerminalCursorShape">
       <default>'block'</default>
-      <_summary>The cursor appearance</_summary>
-      <_description>
+      <summary>The cursor appearance</summary>
+      <description>
         The possible values are "block" to use a block cursor, "ibeam" to
         use a vertical line cursor, or "underline" to use an underline cursor.
-      </_description>
+      </description>
     </key>
     <key name="use-system-font" type="b">
       <default>true</default>
-      <_summary>Whether to use the system font</_summary>
-      <_description>
+      <summary>Whether to use the system font</summary>
+      <description>
         If true, the terminal will use the desktop-global standard
         font if it's monospace (and the most similar font it can
         come up with otherwise).
-      </_description>
+      </description>
     </key>
     <key name="font" type="s">
       <default>'Monospace 10'</default>
-      <_summary>Font</_summary>
-      <_description>
+      <summary>Font</summary>
+      <description>
         A Pango font name. Examples are "Sans 12" or "Monospace Bold 14".
-      </_description>
+      </description>
     </key>
   </schema>
 </schemalist>
diff --git a/plugins/translate/org.gnome.gedit.plugins.translate.gschema.xml.in 
b/plugins/translate/org.gnome.gedit.plugins.translate.gschema.xml
similarity index 88%
rename from plugins/translate/org.gnome.gedit.plugins.translate.gschema.xml.in
rename to plugins/translate/org.gnome.gedit.plugins.translate.gschema.xml
index f53dea4..1f56b4d 100644
--- a/plugins/translate/org.gnome.gedit.plugins.translate.gschema.xml.in
+++ b/plugins/translate/org.gnome.gedit.plugins.translate.gschema.xml
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.translate" 
path="/org/gnome/gedit/plugins/translate/">
+  <schema gettext-domain="gedit-plugins" id="org.gnome.gedit.plugins.translate" 
path="/org/gnome/gedit/plugins/translate/">
     <key name="output-to-document" type="b">
       <default>true</default>
       <summary>Where translation output is shown</summary>
diff --git a/plugins/wordcompletion/org.gnome.gedit.plugins.wordcompletion.gschema.xml 
b/plugins/wordcompletion/org.gnome.gedit.plugins.wordcompletion.gschema.xml
new file mode 100644
index 0000000..8b6b2e3
--- /dev/null
+++ b/plugins/wordcompletion/org.gnome.gedit.plugins.wordcompletion.gschema.xml
@@ -0,0 +1,15 @@
+<schemalist>
+  <schema gettext-domain="gedit-plugins" id="org.gnome.gedit.plugins.wordcompletion" 
path="/org/gnome/gedit/plugins/wordcompletion/">
+    <key name="interactive-completion" type="b">
+      <default>true</default>
+      <summary>Interactive Completion</summary>
+      <description>Whether to enable interactive completion.</description>
+    </key>
+    <key name="minimum-word-size" type="u">
+      <range min="2" max="100" />
+      <default>2</default>
+      <summary>Minimum Word Size</summary>
+      <description>The minimum word size to complete.</description>
+    </key>
+  </schema>
+</schemalist>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]