From 96c541bb7485e92e0a67123c8519fe01a1cc5a65 Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Tue, 24 Jul 2012 16:13:57 +0400
Subject: [PATCH] fixed PY-6946 Make separate plugin for: GNU GetText (.po)
 files

---
 python/build/pycharm_build.gant              |  9 ++++++++-
 python/main_pycharm.iml                      |  1 +
 python/python.iml                            |  1 +
 python/src/META-INF/python-plugin-common.xml | 13 +------------
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/python/build/pycharm_build.gant b/python/build/pycharm_build.gant
index 6749d18bc997..389706d9f46a 100644
--- a/python/build/pycharm_build.gant
+++ b/python/build/pycharm_build.gant
@@ -42,7 +42,7 @@ setProperty("pluginFilter", [
             "coffeescript",
             "python-remote-interpreter",
             "diagram-api", "uml",
-            "python-uml"
+            "python-uml", "localization"
             ])
 
 private List<String> pycharmPlatformApiModules() {
@@ -350,6 +350,13 @@ private layoutFull(Map args, String target, Set usedJars) {
           }
         }
       }
+      dir("localization") {
+        dir("lib") {
+          jar("localization.jar") {
+            module("localization")
+          }
+        }
+      }
     }
 
     def layouts = includeFile("$home/build/scripts/layouts.gant")
diff --git a/python/main_pycharm.iml b/python/main_pycharm.iml
index 825c996c99f6..27fbe1f3eea5 100644
--- a/python/main_pycharm.iml
+++ b/python/main_pycharm.iml
@@ -30,6 +30,7 @@
     <orderEntry type="module" module-name="jira-connector" />
     <orderEntry type="module" module-name="uml" />
     <orderEntry type="module" module-name="python-uml" />
+    <orderEntry type="module" module-name="localization" />
   </component>
 </module>
 
diff --git a/python/python.iml b/python/python.iml
index 84970a37960d..6d9fb532b485 100644
--- a/python/python.iml
+++ b/python/python.iml
@@ -38,6 +38,7 @@
     <orderEntry type="module" module-name="ChromeConnector" />
     <orderEntry type="module" module-name="FirefoxConnector" />
     <orderEntry type="library" name="Velocity" level="project" />
+    <orderEntry type="module" module-name="localization" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/python/src/META-INF/python-plugin-common.xml b/python/src/META-INF/python-plugin-common.xml
index ca04dcd5d281..55d012fde48a 100644
--- a/python/src/META-INF/python-plugin-common.xml
+++ b/python/src/META-INF/python-plugin-common.xml
@@ -583,7 +583,7 @@
                        implementationClass="com.jetbrains.django.lang.template.highlighting.DjangoTemplateBraceMatcher"/>
 
     <intentionAction>
-      <className>com.jetbrains.django.localization.ref.WrapTransTagIntention</className>
+      <className>com.jetbrains.django.ref.WrapTransTagIntention</className>
       <category>Django</category>
     </intentionAction>
 
@@ -648,17 +648,6 @@
 
     <problemFileHighlightFilter implementation="com.jetbrains.python.buildout.config.BuildoutCfgProblemFileHighlightFilter"/>
 
-
-    <!-- Locale -->
-    <colorSettingsPage implementation="com.jetbrains.django.localization.LocaleColorsPage"/>
-    <lang.syntaxHighlighterFactory key="Locale"
-                                   implementationClass="com.jetbrains.django.localization.LocaleHighlighterFactory"/>
-    <lang.parserDefinition language="Locale" implementationClass="com.jetbrains.django.localization.LocaleParserDefinition"/>
-    <fileTypeFactory implementation="com.jetbrains.django.localization.LocaleFileTypeFactory"/>
-    <annotator language="Locale" implementationClass="com.jetbrains.django.localization.validation.LocaleAnnotatingVisitor"/>
-    <quoteHandler fileType="Locale" className="com.jetbrains.django.localization.editor.LocaleQuoteHandler"/>
-    <problemFileHighlightFilter implementation="com.jetbrains.django.localization.LocaleProblemFileHighlightFilter"/>
-    <!--<fileEditorProvider implementation="com.jetbrains.django.localization.editor.LocaleFileEditorProvider"/>-->
     <qualifiedNameProvider implementation="com.jetbrains.python.actions.PyQualifiedNameProvider"/>
 
     <!-- ReST files -->