Changeset 1466 in products for quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/keywords.py

Timestamp:

Dec 22, 2009 7:23:04 PM (14 years ago)

Author:

liebster

Message:

Cleaned code and added translation

File:

• quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/keywords.py (modified) (3 diffs)

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/keywords.py

@@ -16 +16 @@
     def validateKeywords(self, text):
         """ see interface """
+        ts = getToolByName(self.context, 'translation_service')
         # extract keywords from text
-        if not text.strip():
-            return _(u'Keywords list is empty!')
-
-        keywords = map(lambda x: x.strip(), text.lower().split('\n'))
-        if not keywords:
-            return _(u'Keywords list is empty!')
-
+        if text.lower().strip():
+            keywords = map(lambda x: x.strip(), text.lower().strip().split('\n'))
+        else:
+            return ts.utranslate(None, _(u'Keywords list is empty!'), context=self.context)
         # request html page of context object
         url = '%s?qseo_without_additional_keywords=1' % self.context.absolute_url()
@@ -69 +67 @@
         # check every keyword on appearing in body of html page
         missing = []
+        finding = []
         added = {}
+        finded = {}
         for keyword in keywords:
-            if keyword not in added.keys() and not re.compile(r'\b%s\b' % keyword, re.I).search(page_text):
-                missing.append(keyword)
-                added[keyword] = 1
-
+            if keyword:
+                keyword_on_page =  len(re.compile(r'\s%s\s' % keyword, re.I).findall(page_text))
+                if keyword not in added.keys() and not keyword_on_page:
+                    missing.append(keyword.decode('utf8'))
+                    added[keyword] = 1
+                if keyword not in finded.keys() and keyword_on_page:
+                    finding.append(keyword.decode('utf8')+' - '+repr(keyword_on_page))
+                    finded[keyword] = 1
         # return list of missing keywords
         if missing:
-            msg = u"""Next keywords did not appear on the page:\n%s""" % '\n'.join(missing)
+            msg = ts.utranslate(None, _('missing_keywords', default=u'Next keywords did not appear on the page:\n${missing}', mapping={'missing':'\n'.join(missing)}), context=self.context)
         else:
-            msg = u"""All keywords found on the page!"""
-        return _(msg)
+            msg = ts.utranslate(None, _('finded_keywords', default=u'All keywords found on the page!\nMore detailed:\n${found}', mapping={'found': '\n'.join(finding)}), context=self.context)
+        return msg
 
     def walkTextNodes(self, parent, page_words=[]):
@@ -100 +104 @@
                     # pop everything from the the left-angle bracket until the right-angle bracket
                     s_list.pop(i)
-                    
+
                 # pops the right-angle bracket, too
                 s_list.pop(i)
             else:
                 i=i+1
-                
+
         # convert the list back into text
         join_char=''