From 9d52220ea7502c81d3f90301dd1312091612819d Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar@redhat.com>
Date: Wed, 31 Jan 2018 12:18:43 +0900
Subject: [PATCH] Move cn layout to extras.xml for Chinese

Most Chinese uses 'us' layout and the majority expects 'Chinese' enables
an input method so the 'cn' layout could confuse people.
Wish to move 'cn' layout to extras.xml not to be shown by default.

https://bugs.freedesktop.org/show_bug.cgi?id=104868
---
 rules/base.extras.xml.in | 11 +++++++++++
 rules/base.xml.in        |  3 ---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/rules/base.extras.xml.in b/rules/base.extras.xml.in
index c2ddb86..2ab4aac 100644
--- a/rules/base.extras.xml.in
+++ b/rules/base.extras.xml.in
@@ -1155,6 +1155,17 @@
       </configItem>
       <variantList/>
     </layout>
+    <layout>
+      <configItem>
+        <name>cn</name>
+        <!-- Keyboard indicator for Chinese layouts -->
+        <_shortDescription>zh</_shortDescription>
+        <_description>Chinese</_description>
+        <languageList>
+          <iso639Id>chi</iso639Id>
+        </languageList>
+      </configItem>
+    </layout>
   </layoutList>
   <optionList>
       <group allowMultipleSelection="true">
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 3a3a9cd..1079517 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -2663,9 +2663,6 @@
         <!-- Keyboard indicator for Chinese layouts -->
         <_shortDescription>zh</_shortDescription>
         <_description>Chinese</_description>
-        <languageList>
-          <iso639Id>chi</iso639Id>
-        </languageList>
       </configItem>
       <variantList>
         <variant>
-- 
2.14.2