Changeset 1319447

Timestamp:

01/01/2016 09:43:34 AM (10 years ago)

Author:

expresscurate

Message:

new version v2.1.5 with changes:

• Wordpress 4.4 supported now.
• Miscellaneous bug fixes and improvements.

Location:

expresscurate/trunk

Files:

• ExpressCurate.php (modified) (1 diff)
• ExpressCurate_Actions.php (modified) (2 diffs)
• ExpressCurate_AjaxExportAPI.php (modified) (1 diff)
• ExpressCurate_FeedManager.php (modified) (6 diffs)
• ExpressCurate_HtmlParser.php (modified) (4 diffs)
• ExpressCurate_Tags.php (modified) (1 diff)
• css/dialog-style-3.9.css (modified) (2 diffs)
• css/expresscurate.css (modified) (5 diffs)
• js/Buttons.js (modified) (5 diffs)
• js/keywords/KeywordUtils.js (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• templates/advanced_seo_widget.php (modified) (13 diffs)
• templates/bookmarks.php (modified) (7 diffs)
• templates/content_feed_archive.php (modified) (4 diffs)
• templates/dashboard.php (modified) (10 diffs)
• templates/dialog.php (modified) (8 diffs)
• templates/faq.php (modified) (6 diffs)
• templates/feed_dashboard.php (modified) (2 diffs)
• templates/feed_list.php (modified) (7 diffs)
• templates/keywords.php (modified) (4 diffs)
• templates/news.php (modified) (1 diff)
• templates/settings.php (modified) (27 diffs)
• templates/sitemap.php (modified) (9 diffs)
• templates/social_posts_widget.php (modified) (3 diffs)
• templates/sources_coll_widget.php (modified) (3 diffs)
• templates/support.php (modified) (3 diffs)
• templates/websites.php (modified) (3 diffs)
• templates/widget.php (modified) (5 diffs)

expresscurate/trunk/ExpressCurate.php

@@ -5 +5 @@
   Plugin URI: http://www.expresscurate.com/products
   Description: ExpressCurate plugin is a content curation tool for WordPress. It enables you to create and publish high quality content within minutes.
-  Version: 2.1.4
+  Version: 2.1.5
   Author: ExpressCurate
   Author URI: http://www.expresscurate.com

expresscurate/trunk/ExpressCurate_Actions.php

@@ -167 +167 @@
         add_action('wp_ajax_expresscurate_bookmark_set', array($this->feedManager, 'set_bookmark'));
         add_action('wp_ajax_expresscurate_bookmark_get', array($this->feedManager, 'get_bookmark'));
+        add_action('wp_ajax_expresscurate_bookmarks_get', array($this->feedManager, 'get_bookmarks'));
         add_action('wp_ajax_expresscurate_bookmarks_delete', array($this->feedManager, 'delete_bookmarks'));
         add_action('wp_ajax_expresscurate_delete_feed_content_items', array($this->feedManager, 'delete_feed_content_items'));
@@ -1848 +1849 @@
         }
 
-
-
-        if (!ExpressCurate_HtmlParser::isNotSafeMode() || strlen(ini_get('open_basedir'))!=0) {
+        if(ExpressCurate_HtmlParser::isSafeMode() || strlen(ini_get('open_basedir')) !=0  ) {
             echo '<div class="update-nag">
                       For the plugin to perform properly make sure those settings on your server in the following states.</br>

expresscurate/trunk/ExpressCurate_AjaxExportAPI.php

@@ -51 +51 @@
             
             $sppResult = array();
-            foreach ($profiles as $profile) {
-                 $profileId = $profile->id;
-                 if ($profilesStatus->$profileId == 'on' || empty($profilesStatus->$profileId)) {
-                     $sppResult[] = array(
-                         'id' => $profileId,
-                         'title' => $profile->formatted_service . '/' . $profile->formatted_username);
-                 }
-            }
+            if(isset($profiles)){
+                foreach ($profiles as $profile) {
+                    $profileId = $profile->id;
+                    if ($profilesStatus->$profileId == 'on' || empty($profilesStatus->$profileId)) {
+                        $sppResult[] = array(
+                            'id' => $profileId,
+                            'title' => $profile->formatted_service . '/' . $profile->formatted_username);
+                    }
+                }
+            }
+
 
             $data['social_publishing'] = $sppResult;

expresscurate/trunk/ExpressCurate_FeedManager.php

@@ -119 +119 @@
         $data = $_REQUEST;
         if ($data['url']) {
-            $data['url'] = htmlentities($data['url'], ENT_COMPAT);
             $curated_links_rss = get_option('expresscurate_links_rss', '');
             if ($curated_links_rss) {
@@ -384 +383 @@
     }
 
-
     public function get_feed_content()
     {
@@ -421 +419 @@
                 foreach ($curated_links_rss as $url => $feed_url) {
                     // pull content
-                    $lookup_url = "http://ajax.googleapis.com/ajax/services/feed/load?v=1.0&q=" . urlencode($feed_url['feed_url']) . "&num=-1";
+                    $lookup_url = "http://ajax.googleapis.com/ajax/services/feed/load?v=1.0&num=-1&q=" . urlencode($feed_url['feed_url']);
                     $htmlparser = new ExpressCurate_HtmlParser($lookup_url);
                     $res = $htmlparser->download();
@@ -428 +426 @@
                     $this->collect_feed($result, $deleted_urls, $feed_array, 'feed', $date, $unseen_feeds);
                 }
+
                 update_option('unseen_feeds_count', $unseen_feeds);
             }
@@ -753 +752 @@
                     $this->collectBookmark($bookmarks, $item);
 
-                    // $result[$bookmarkURL]['status'] = 'success';
+                     $result[$bookmarkURL]['status'] = 'success';
                 }
             }
@@ -969 +968 @@
     {
         $bookmarks = get_option('expresscurate_bookmarks', '');
-        if ($bookmarks) {
-            $bookmarks = json_decode($bookmarks, true);
-        } else {
-            $bookmarks = array();
-        }
-        return $bookmarks;
+        if(isset($_REQUEST['action']) && $_REQUEST['action'] == "expresscurate_bookmarks_get"){
+            echo $bookmarks;
+            die;
+        }
+        else {
+            if ($bookmarks) {
+                $bookmarks = json_decode($bookmarks, true);
+            } else {
+                $bookmarks = array();
+            }
+            return $bookmarks;
+        }
     }
 

expresscurate/trunk/ExpressCurate_HtmlParser.php

@@ -47 +47 @@
     }
 
-    public static function isNotSafeMode()
+    public static function isSafeMode()
     {
         $safeMode = ini_get('safe_mode');
         if(!empty($safeMode) && version_compare(PHP_VERSION, '5.4.0') < 0) {
+            return true;
+        } else {
             return false;
-        } else {
-            return true;
         }
     }
@@ -177 +177 @@
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
         curl_setopt($ch, CURLOPT_MAXREDIRS, 5);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
+        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 500);
         return $ch;
     }
@@ -248 +248 @@
         }
         $curlDownload = true;
-        if(!self::isNotSafeMode()){
+        if(self::isSafeMode()){
             $curlDownload = false;
-        } else if(strlen(ini_get('open_basedir'))!=0){
+        } else if(strlen(ini_get('open_basedir')) !=0 ){
             $curlDownload = false;
         } else if(self::supportsAsynch())   {
@@ -332 +332 @@
         if (!$this->raw) {
             // cleanup the content
-            $content = self::sanitizeContent($content);
+            if ($contentType) {
+                list($content_type,$encoding) = explode("=", $contentType);
+                if(trim($content_type)=="text/html"){
+                    $content = self::sanitizeContent($content);
+                }
+            }
 
             // check if encoding is found

expresscurate/trunk/ExpressCurate_Tags.php

@@ -25 +25 @@
     {
         // TODO for multiline use /m
-        return preg_replace_callback('/(?![^<]*<\/a)(\b' . $this->word . '\b)(?=[^>]*(<|$))(?=(.*?))/uUis', array(&$this, 'checkOpenTag'), $html,1);
+        return preg_replace_callback('/(?![^<]*<\/[a|h])(\b' . $this->word . '\b)(?=[^>]*(<|$))(?=(.*?))/uUis', array(&$this, 'checkOpenTag'), $html,1);
         //return preg_replace_callback('/(#?)(\b' . $this->word . '\b)(?=[^>]*(<|$))(?=(.*?))/Uuis', array(&$this, 'checkOpenTag'), $html,1);
     }

expresscurate/trunk/css/dialog-style-3.9.css

@@ -4 +4 @@
     border-radius: 0 !important;
     border:none;
-    z-index: 100091 !important;
+    z-index: 1002 !important;
 }
 .ui-widget-overlay{
@@ -11 +11 @@
     background: #000 !important;
     position: fixed;
-    z-index: 100090 !important;
+    z-index: 1001 !important;
 }
 div[aria-describedby="expresscurate_clone_dialog"] .ui-dialog-titlebar,

expresscurate/trunk/css/expresscurate.css

@@ -1245 +1245 @@
     margin-left: 6px;
     margin-right: 6px;
-    z-index: 90000;
+    z-index: 1001;
 }
 .expresscurate_settings .addUsers,
@@ -2824 +2824 @@
     border-color: #ddd;
     -webkit-box-shadow: none;
-    box-shadow: none);
-    -moz-box-shadow: none;
-    -webkit-box-shadow:none;
     box-shadow: none;
     -moz-box-shadow: none;
@@ -4317 +4314 @@
         .expresscurate_feedBoxes .checkInput[type=checkbox]:checked + label{
             background: url("../images/feed_icons.svg") no-repeat -75px -3px;
-            background-size: auto 73px;
-        }
+            background-size: 157px auto;
+        }
+@-moz-document url-prefix() {
+    .expresscurate_bookmarkBoxes .checkInput[type=checkbox]:checked + label,
+    .expresscurate_feedBoxes .checkInput[type=checkbox]:checked + label {
+        background: url("../images/feed_icons.svg") no-repeat -75px 1px;
+        background-size: 157px auto;
+    }
+    .expresscurate_controls li.linkToDeletedPosts{
+        background-position: -180px -35px;
+        background-size: auto 100px;
+    }
+    .expresscurate_controls li.linkToDeletedPosts:hover{
+        background-position: -181px -76px;
+    }
+    .expresscurate_feed_list .feedListControls .pull {
+        background-position: -148px -34px;
+    }
+    .expresscurate_feed_list .feedListControls .pull:hover {
+        background-position: -148px -75px;
+    }
+    .expresscurate_controls .check {
+        background-position: -104px -35px;
+    }
+    .expresscurate_controls .check.active {
+        background-position: -104px -75px;
+    }
+    .expresscurate_controls .remove {
+        background-position: -49px 8px;
+    }
+    .expresscurate_controls .remove.active {
+        background-position: -49px -25px;
+    }
+    .expresscurate_controls .remove.active:hover {
+        background-position: -49px -59px;
+    }
+}
         .expresscurate_bookmarkBoxes li input[type=checkbox],
         .expresscurate_feedBoxes li input[type=checkbox]{
@@ -5144 +5176 @@
     .expresscurate_masonryItem{
         width: 32%;
-        width: -webkit-calc( ( 100% - 20px ) / 3 );
-        width: -moz-calc( ( 100% - 20px ) / 3 );
-        width: calc( ( 100% - 20px ) / 3 );
+        width: -webkit-calc((100% - 20px)/3);
+        width: -moz-calc((100% - 20px)/3);
+        width: calc((100% - 20px )/3);
     }
 }
@@ -5157 +5189 @@
     .expresscurate_masonryItem{
         width: 47%;
-        width: -webkit-calc( ( 100% - 10px ) / 2 );
-        width: -moz-calc( ( 100% - 10px ) / 2 );
-        width: calc( ( 100% - 10px ) / 2 );
+        width: -webkit-calc((100% - 10px)/2);
+        width: -moz-calc((100% - 10px )/2);
+        width: calc((100% - 10px)/2);
     }
 }

expresscurate/trunk/js/Buttons.js

@@ -150 +150 @@
 
         var imagesInPost = $(content).find('img').length ? true : false,
-            videoInPost = tinyMCE.get('content').getContent().indexOf('[embed]') > -1;
+            videoInPost = $(content).text().indexOf('[embed]') > -1;
         messageHtml += (!imagesInPost && !videoInPost) ? '<p class="lengthSuggestion red">Your post currently doesn’t have an image(video). Adding a media is a good way to improve conversion rates by creating visual associations with your posts.</p>' : '';
         messageHtml += $('.attachment-post-thumbnail').length ? '' : '<p class="lengthSuggestion red">Your post currently doesn’t have a featured image. Adding a featured image is a good way to improve conversion rates by creating visual associations with your posts.</p>';
@@ -455 +455 @@
 
             recoverShortcode: function (co) {
-                function getAttr(s, n) {
+                /*function getAttr(s, n) {
                     n = new RegExp(n + '=\"([^\"]+)\"', 'g').exec(s);
                     return n ? tinymce.DOM.decode(n[1]) : '';
                 }
 
-                return co.replace(/(?:<p[^>]*>)*(<img[^>]+>)(?:<\/p>)*/g, function (a, im) {
+                return co.replace(/(?:<p[^>]*>)*(<img[^>]+>)(?:<\/p>)*!/g, function (a, im) {
                     var cls = getAttr(im, 'class');
                     if (cls.indexOf('expresscurate_FacebookEmbed') != -1) {
@@ -466 +466 @@
                     }
                     return a;
-                });
+                });*/return co;
             },
 
@@ -472 +472 @@
             init: function (ed, url) {
 
-                var t = this;
+                var t = this,
+                    mainEditor= tinyMCE.get('content');
                 t.url = url;
                 //replace shortcode before editor content set
-                ed.onBeforeSetContent.add(function (ed, o) {
+
+                mainEditor.onBeforeSetContent.add(function (ed, o) {
                     o.content = t.visualizeShortcode(o.content);
                 });
                 //replace shortcode as its inserted into editor
-                ed.onExecCommand.add(function (ed, cmd) {
+                mainEditor.onExecCommand.add(function (ed, cmd) {
                     if (cmd === 'mceInsertContent') {
-                        tinyMCE.activeEditor.setContent(t.visualizeShortcode(tinyMCE.activeEditor.getContent()));
+                        ed.setContent(t.visualizeShortcode(ed.getContent()));
                     }
                 });
                 //replace the image back to shortcode on save
-                ed.onPostProcess.add(function (ed, o) {
-                    if (o.get)
+               /* mainEditor.onPostProcess.add(function (ed, o) {
+                    if (o.get){
                         o.content = t.recoverShortcode(o.content);
-                });
+                    }
+                });*/
 
                 // Register buttons - trigger above command when clicked
@@ -592 +595 @@
 
                 ed.onLoadContent.add(function (ed) {
-                    var dom = tinymce.activeEditor.dom,
+                    var dom = tinymce.DOM,
                         divElements = dom.select('div[class*=expresscurate]');
                     dom.setStyle(divElements, 'height', 'auto');

expresscurate/trunk/js/keywords/KeywordUtils.js

@@ -65 +65 @@
         return result;
     }
-
+    function escapeRegExp(str) {
+        return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
+    }
     function close(keyword, elemToRemove, defElem) {
+
+        keyword=escapeRegExp(keyword);
 
         var $defTags =defElem ? defElem : $('textarea[name=expresscurate_defined_tags]'),

expresscurate/trunk/readme.txt

@@ -4 +4 @@
 Donate link: https://bit.ly/expresscuratedonate
 Requires at least: 3.9
-Tested up to: 4.3.1
-Stable tag: 2.1.4
+Tested up to: 4.4.0
+Stable tag: 2.1.5
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl.html
@@ -132 +132 @@
 == Changelog ==
 
+= 2.1.5 =
+* Wordpress 4.4 supported now.
+* Miscellaneous bug fixes and improvements.
+
 = 2.1.4 =
 * Wordpress 4.3 supported now.

expresscurate/trunk/templates/advanced_seo_widget.php

@@ -11 +11 @@
            id="expresscurate_post_analysis_notification"/>
     <ul class="tabs">
-        <li class="tab-link expresscurate_preventTextSelection green current" data-tab="tab-1">General</li>
+        <li class="tab-link expresscurate_preventTextSelection green current" data-tab="tab-1"><?php _e('General'); ?></li>
         <li class="tab-link expresscurate_preventTextSelection red <?php if (get_option('expresscurate_sitemap_update_permission') == 'error') echo 'disabled'; ?>"
-            data-tab="tab-2">Sitemap
+            data-tab="tab-2"><?php _e('Sitemap'); ?>
         </li>
-        <li class="tab-link expresscurate_preventTextSelection blue" data-tab="tab-3">Social</li>
-        <li class="tab-link postAnalysisLink expresscurate_preventTextSelection yellow" data-tab="tab-4">Post Analysis
+        <li class="tab-link expresscurate_preventTextSelection blue" data-tab="tab-3"><?php _e('Social'); ?> </li>
+        <li class="tab-link postAnalysisLink expresscurate_preventTextSelection yellow" data-tab="tab-4"><?php _e('Post Analysis'); ?>
         </li>
     </ul>
@@ -26 +26 @@
             <div id="expresscurate_ClonePostWrap" class="<?php if(!$postCopy) {echo 'expresscurate_displayNone';} ?>">
                 <div class="info">
-                    <label for="expresscurate_advanced_seo_post_copy" class="label">Content cloned</label>
+                    <label for="expresscurate_advanced_seo_post_copy" class="label"><?php _e('Content cloned'); ?></label>
                 </div>
                 <div class="value">
@@ -42 +42 @@
             </div>
             <div class="info">
-                <label for="expresscurate_advanced_seo_title" class="label">SEO Title</label>
+                <label for="expresscurate_advanced_seo_title" class="label"><?php _e('SEO Title'); ?></label>
             </div>
             <div class="value">
@@ -51 +51 @@
             <div class="expresscurate_clear"></div>
             <div class="info">
-                <label for="expresscurate_advanced_seo_canonical_url" class="label">Canonical URL</label>
+                <label for="expresscurate_advanced_seo_canonical_url" class="label"><?php _e('Canonical URL'); ?></label>
             </div>
             <div class="value">
@@ -63 +63 @@
             <div class="expresscurate_clear"></div>
             <div class="info">
-                <label class="robotsLabel">Robots must follow links </label>
+                <label class="robotsLabel"><?php _e('Robots must follow links '); ?></label>
             </div>
             <div class="value">
@@ -79 +79 @@
             <div class="expresscurate_clear"></div>
             <div class="info">
-                <label class="robotsLabel">Robots must index this page </label>
+                <label class="robotsLabel"><?php _e('Robots must index this page '); ?></label>
             </div>
             <div class="value">
@@ -101 +101 @@
                 <li>
                     <div class="info">
-                        <span class="label">Configure Sitemap Manually</span>
+                        <span class="label"><?php _e('Configure Sitemap Manually'); ?></span>
                     </div>
                     <div class="value">
@@ -115 +115 @@
                         <li>
                             <div class="info">
-                                <span class="label">Exclude from sitemap</span>
+                                <span class="label"><?php _e('Exclude from sitemap'); ?></span>
                             </div>
                             <div class="value">
@@ -129 +129 @@
                             <li>
                                 <div class="info">
-                                    <span class="label">Sitemap frequency</span>
-                                    <span class="gray-italic desc">Please select frequency for posts in sitemap</span>
+                                    <span class="label"><?php _e('Sitemap frequency'); ?></span>
+                                    <span class="gray-italic desc"><?php _e('Please select frequency for posts in sitemap'); ?></span>
                                 </div>
                                 <div class="value">
@@ -149 +149 @@
                             <li>
                                 <div class="info">
-                                    <span class="label">Sitemap priority</span>
-                                    <span class="gray-italic desc">Please select priority for posts in sitemap</span>
+                                    <span class="label"><?php _e('Sitemap priority'); ?></span>
+                                    <span class="gray-italic desc"><?php _e('Please select priority for posts in sitemap'); ?></span>
                                 </div>
                                 <div class="value">
@@ -176 +176 @@
         <div id="expresscurate_social_widget">
             <div class="info">
-                <label for="expresscurate_advanced_seo_social_title" class="label">Title</label>
+                <label for="expresscurate_advanced_seo_social_title" class="label"><?php _e('Title'); ?></label>
             </div>
             <div class="value">
@@ -185 +185 @@
             <div class="expresscurate_clear"></div>
             <div class="info">
-                <label for="expresscurate_advanced_seo_social_shortdesc" class="label">Short Description</label>
+                <label for="expresscurate_advanced_seo_social_shortdesc" class="label"><?php _e('Short Description'); ?></label>
             </div>
             <div class="value">
@@ -195 +195 @@
             <div class="expresscurate_clear"></div>
             <div class="info">
-                <label for="expresscurate_advanced_seo_social_desc" class="label">Description</label>
+                <label for="expresscurate_advanced_seo_social_desc" class="label"><?php _e('Description'); ?></label>
             </div>
             <div class="value">

expresscurate/trunk/templates/bookmarks.php

@@ -12 +12 @@
     } ?>">
     <div class="expresscurate_headBorderBottom expresscurate_OpenSansRegular">
-        <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs">Suggestions? <span>Submit here!</span></a>
+        <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs"><?php _e('Suggestions? '); ?><span><?php _e('Submit here!'); ?></span></a>
 
-        <h2>Bookmarks</h2>
+        <h2><?php _e('Bookmarks'); ?></h2>
 
         <div class="pageDesc">
-            List of your bookmarked web pages. You can start a post by picking a bookmarked article (or multiple
-            articles) and clicking on the curate button.
+<?php _e('List of your bookmarked web pages. You can start a post by picking a bookmarked article (or multiple
+            articles) and clicking on the curate button.'); ?>
         </div>
         <div class="controlsWrap">
             <ul class="bookmarkListControls expresscurate_preventTextSelection expresscurate_controls">
                 <li class="check">
-                    <span class="tooltip">select / deselect</span>
+                    <span class="tooltip"><?php _e('select / deselect'); ?></span>
                 </li>
                 <li class="remove expresscurate_floatRight">
-                    <span class="tooltip">delete</span>
+                    <span class="tooltip"><?php _e('delete'); ?></span>
                 </li>
                 <li class="quotes expresscurate_floatRight">
-                    <span class="tooltip">curate</span>
+                    <span class="tooltip"><?php _e('curate'); ?></span>
                 </li>
                 <li class="layout expresscurate_floatRight">
                 <span class="tooltip"><?php if (get_option('expresscurate_bookmark_layout', '') == 'single') {
-                        echo 'view as grid';
+                         _e('view as grid');
                     } else {
-                        echo 'view as list';
+                         _e('view as list');
                     } ?></span>
                 </li>
@@ -43 +43 @@
     </div>
 
-    <label class="expresscurate_displayNone expresscurate_notDefined">Currently you have no bookmarked web
-        pages.</label>
+    <label class="expresscurate_displayNone expresscurate_notDefined"><?php _e('Currently you have no bookmarked web
+        pages.'); ?></label>
     <ul class="expresscurate_bookmarkBoxes expresscurate_masonryWrap">
         <div class="addNewBookmark expresscurate_masonryItem grid-sizer">
-            <label for="addBookmark ">Add new Bookmark</label>
+            <label for="addBookmark "><?php _e('Add new Bookmark'); ?></label>
 
             <div class="addBookmark">
@@ -87 +87 @@
                                 <li class="<?php echo $color ?>"><?php echo $keyword; ?>
                                     <span class="tooltip">
-                              <div class="<?php echo $color ?>">Keyword match</div>
-                    <span class="inTitle">title<p class=""><?php echo $stats['title'] ?></p></span><!--inTitle yes|no-->
-                    <span class="inContent">content<p><?php echo $stats['percent'] * 100 ?>%</p></span>
+                              <div class="<?php echo $color ?>"><?php _e('Keyword match'); ?></div>
+                    <span class="inTitle"><?php _e('title'); ?><p class=""><?php echo $stats['title'] ?></p></span><!--inTitle yes|no-->
+                    <span class="inContent"><?php _e('content'); ?><p><?php echo $stats['percent'] * 100 ?>%</p></span>
                   </span>
                                 </li>
@@ -100 +100 @@
                     <a target="_blank"><?php echo $item['title'] ?></a><br/>
                     <a data-encodedurl="<?php echo base64_encode(urlencode($item['link'])) ?>" class="url" target="_blank" href="<?php echo $item['link'] ?>"><?php echo $item['domain'] ?></a>
-                    <!--<span class="curatedBy">/<?php /*echo $item['curated'] ? 'curated by' : 'author'; */ ?> <span><?php /*echo $item['author']; */ ?></span> /</span>-->
-                    <span class="curatedBy">/ by <span><?php echo $item['user']; ?></span> /</span>
+                    <span class="curatedBy"><?php _e('/ by '); ?><span><?php echo $item['user']; ?></span> /</span>
                 <span
                     class="time"><?php echo human_time_diff(strtotime($item['bookmark_date']), current_time('timestamp')) . ' ago'; ?></span>
@@ -109 +108 @@
                             echo 'active';
                         } ?>"
-                               for="comment__<?php echo $i ?>"><?php echo $item['comment'] ? stripslashes($item['comment']) : 'add comment'; ?></label>
+                               for="comment__<?php echo $i ?>"><?php echo $item['comment'] ? stripslashes($item['comment']) : __('add comment'); ?></label>
                         <input type="text" class="expresscurate_disableInputStyle expresscurate_displayNone"
                                id="comment__<?php echo $i ?>" value="<?php echo stripslashes( $item['comment']); ?>">
@@ -122 +121 @@
                             if (get_option('expresscurate_social_publishing', '') == "on" && strlen(get_option('expresscurate_buffer_access_token')) > 2) {
                         ?>
-                            <li class="share">Share </li>
+                            <li class="share"><?php _e('Share'); ?> </li>
                             <li class="separator">-</li>
                         <?php } ?>
-                        <li class="copyURL">Copy URL</li>
+                        <li class="copyURL"><?php _e('Copy URL'); ?></li>
                         <li class="separator">-</li>
-                        <li class="hide">Delete</li>
+                        <li class="hide"><?php _e('Delete'); ?></li>
                     </ul>
                     <div class="expresscurate_clear"></div>
-                    <!--<span class="label label_<?php /*echo $item['type'];*/ ?>"><?php /*echo $item['type'];*/ ?></span>-->
                 </li>
                 <?php
@@ -161 +159 @@
             <a class="postTitle" href="{{data.link}}" target="_blank">{{data.title}}</a><br/>
             <a class="url" href="{{data.link}}" target="_blank">{{data.domain}}</a>
-            <span class="curatedBy">/ by <span>{{data.user}}</span> /</span>
+            <span class="curatedBy"><?php _e('/ by '); ?><span>{{data.user}}</span> /</span>
             <span class="time">Just now</span>
 
             <div class="comment">
-                <label class="" for="uniqueId">add comment</label>
+                <label class="" for="uniqueId"><?php _e('add comment'); ?></label>
                 <input type="text" class="expresscurate_disableInputStyle expresscurate_displayNone" id="uniqueId">
                 <span class="expresscurate_displayNone">&#215</span>
             </div>
             <ul class="controls expresscurate_preventTextSelection">
-                <li><a class="curate" href="post-new.php?expresscurate_load_source={{data.curateLink}}">Curate</a></li>
+                <li><a class="curate" href="post-new.php?expresscurate_load_source={{data.curateLink}}"><?php _e('Curate'); ?></a></li>
                 <li class="separator">-</li>
                 <?php
                     if (get_option('expresscurate_social_publishing', '') == "on" && strlen(get_option('expresscurate_buffer_access_token')) > 2) {
                 ?>
-                    <li class="share">Share </li>
+                    <li class="share"><?php _e('Share '); ?></li>
                     <li class="separator">-</li>
                 <?php } ?>
-                <li class="copyURL">Copy URL</li>
+                <li class="copyURL"><?php _e('Copy URL'); ?></li>
                 <li class="separator">-</li>
-                <li class="hide">Delete</li>
+                <li class="hide"><?php _e('Delete'); ?></li>
 
             </ul>
             <div class="expresscurate_clear"></div>
-            <!--<span class="label label_{{data.type}}">{{data.type}}</span>-->
         </li>
     </script>

expresscurate/trunk/templates/content_feed_archive.php

@@ -45 +45 @@
     } ?>">
     <div class="expresscurate_headBorderBottom expresscurate_OpenSansRegular">
-        <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs">Suggestions? <span>Submit here!</span></a>
+        <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs"><?php _e('Suggestions? '); ?><span><?php _e('Submit here!'); ?></span></a>
 
-        <h2>Content Feed Archive</h2>
+        <h2><?php _e('Content Feed Archive'); ?></h2>
 
         <div class="pageDesc">
-            This page contains all posts were deleted from Content feed page which you can be restore or delete permanently.
+<?php _e('This page contains all posts were deleted from Content feed page which you can be restore or delete permanently.'); ?>
         </div>
         <div class="controlsWrap">
             <ul class="feedListControls expresscurate_preventTextSelection expresscurate_controls ">
                 <li class="check">
-                    <span class="tooltip">select / deselect</span>
+                    <span class="tooltip"><?php _e('select / deselect'); ?></span>
                 </li>
                 <br class="first"/>
                 <li class="removePermanently expresscurate_floatRight">
-                    <span class="tooltip">remove</span>
+                    <span class="tooltip"><?php _e('remove'); ?></span>
                 </li>
                 <li class="bookmark expresscurate_floatRight">
-                    <span class="tooltip">bookmark</span>
+                    <span class="tooltip"><?php _e('bookmark'); ?></span>
                 </li>
                 <li class="restore expresscurate_floatRight">
-                    <span class="tooltip">restore</span>
+                    <span class="tooltip"><?php _e('restore'); ?></span>
                 </li>
                 <li class="layout expresscurate_floatRight">
                     <span class="tooltip"><?php if (get_option('expresscurate_bookmark_layout', '') == 'single') {
-                            echo 'view as grid';
+                           _e('view as grid');
                         } else {
-                            echo 'view as list';
+                            _e('view as list');
                         } ?></span>
                 </li>
@@ -111 +111 @@
                                 <li class="expresscurate_keyword <?php echo $color ?>"><?php echo $keyword; ?>
                                     <span class="tooltip">
-                      <div class="<?php echo $color ?>">Keyword match</div>
-                    <span class="inTitle">title<p class=""><?php echo $stats['title'] ?></p></span><!--inTitle yes|no-->
-                    <span class="inContent">content<p><?php echo $stats['percent'] * 100 ?>%</p></span>
+                      <div class="<?php echo $color ?>"><?php _e('Keyword match'); ?></div>
+                    <span class="inTitle"><?php _e('title'); ?><p class=""><?php echo $stats['title'] ?></p></span><!--inTitle yes|no-->
+                    <span class="inContent"><?php _e('content'); ?><p><?php echo $stats['percent'] * 100 ?>%</p></span>
                   </span>
                                 </li>
@@ -131 +131 @@
 
                     <ul class="controls expresscurate_preventTextSelection">
-                        <li class="restore">Restore In Feed</li>
+                        <li class="restore"><?php _e('Restore In Feed'); ?></li>
                         <li class="separator">-</li>
-                        <li class="bookmark">Bookmark</li>
+                        <li class="bookmark"><?php _e('Bookmark'); ?></li>
                         <li class="separator">-</li>
-                        <li class="permanent_remove">Remove</li>
+                        <li class="permanent_remove"><?php _e('Remove'); ?></li>
 
                     </ul>
                     <div class="expresscurate_clear"></div>
-                    <!--<span class="label label_<?php /*echo $item['type'] */ ?>"><?php /*echo $item['type'] */ ?></span>-->
                 </li>
 
@@ -146 +145 @@
             ?><?php
         } ?>
-        <label class="expresscurate_notDefined expresscurate_displayNone">Your content feed is
-            empty. <?php echo (strlen(get_option('expresscurate_links_rss', '')) > 2) ? '' : 'Configure <a
-            href="admin.php?page=expresscurate_feeds">RSS feeds</a> to
-        start.'; ?></label>
+        <label class="expresscurate_notDefined expresscurate_displayNone"><?php _e('Your content feed is
+            empty. ');  echo (strlen(get_option('expresscurate_links_rss', '')) > 2) ? '' : _e('Configure'); ?> <a
+            href="admin.php?page=expresscurate_feeds"><?php _e('RSS feeds'); ?></a> <?php _e('to
+        start.'); ?></label>
     </ul>
     <form method="POST" action="<?php echo get_admin_url() ?>post-new.php#expresscurate_sources_collection"

expresscurate/trunk/templates/dashboard.php

@@ -20 +20 @@
 <div class="expresscurate_blocks expresscurate_Styles wrap">
     <div class="expresscurate_headBorderBottom expresscurate_OpenSansRegular">
-        <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs">Suggestions?
-            <span>Submit here!</span></a>
+        <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs"><?php _e('Suggestions?
+            '); ?><span><?php _e('Submit here!'); ?></span></a>
 
-        <h2>ExpressCurate</h2>
+        <h2><?php _e('ExpressCurate'); ?></h2>
     </div>
     <div class="expresscurate_blocksContainer expresscurate_masonryWrap">
@@ -38 +38 @@
                 if ($ordered_item == "welcome"):
                     echo '<div id="welcome" class="expresscurate_welcomeBlock expresscurate_masonryItem">
-                                            <label class="label">Welcome to ExpressCurate!</label>';
+                                            <label class="label">' . __('Welcome to ExpressCurate!') . '</label>';
                     $this->welcome_widget();
                     echo '</div>';
@@ -44 +44 @@
                 if ($ordered_item == "keyWords"):
                     echo '<div id="keyWords" class="expresscurate_keywordsBlock expresscurate_masonryItem">
-                                            <label class="label">Keywords Summary</label>';
+                                            <label class="label">' . __('Keywords Summary') . '</label>';
                     $this->keywords_widget();
                     echo '</div>';
@@ -50 +50 @@
                 if ($ordered_item == "keyWordsIntOverTime"):
                     echo '<div id="keyWordsIntOverTime" class="expresscurate_keywordsBlock expresscurate_masonryItem">
-                                        <label class="label">Keywords Interest Over Time</label>';
+                                        <label class="label">' . __('Keywords Interest Over Time') . '</label>';
                     $this->keywords_interest_over_time_widget();
                     echo '</div>';
@@ -56 +56 @@
                 if ($ordered_item == "keyWordsRelTopics"):
                     echo '<div id="keyWordsRelTopics" class="expresscurate_keywordsBlock expresscurate_masonryItem">
-                                        <label class="label">Keywords Related Topics</label>';
+                                        <label class="label">' . __('Keywords Related Topics') . '</label>';
                     $this->keywords_related_topics_widget();
                     echo '</div>';
@@ -63 +63 @@
                     if (get_option('expresscurate_publish', '') == "on") {
                         echo '<div id="smartPublish" class="expresscurate_smartPublishBlock expresscurate_masonryItem">
-                                            <label class="label">Smart Publishing Overview</label>';
+                                            <label class="label">' . __('Smart Publishing Overview') . '</label>';
                         $this->smart_publishing_widget();
                         echo '</div>';
@@ -71 +71 @@
                     if (get_option('expresscurate_social_publishing', '') == "on" && strlen(get_option('expresscurate_buffer_access_token')) > 2) {
                         echo '<div id="socialPublish" class="expresscurate_socialPublishBlock expresscurate_masonryItem">
-                                            <label class="label">Social Publishing Overview</label>';
+                                            <label class="label">' . __('Social Publishing Overview') . '</label>';
                         $this->social_publishing_widget();
                         echo '</div>';
@@ -78 +78 @@
                 if ($ordered_item == "feedWidget"):
                     echo '<div id="feedWidget" class="expresscurate_feedBlock expresscurate_masonryItem">
-                                            <label class="label">Feed</label>';
+                                            <label class="label">' . __('Feed') . '</label>';
                     $this->feed_widget();
                     echo '</div>';
@@ -84 +84 @@
                 if ($ordered_item == "bookmarks"):
                     echo '<div id="bookmarks" class="expresscurate_bookmarksBlock expresscurate_masonryItem">
-                                            <label class="label">Bookmarks</label>';
+                                            <label class="label">' . __('Bookmarks') . '</label>';
                     $this->bookmarks_widget();
                     echo '</div>';
@@ -90 +90 @@
                 if ($ordered_item == "support"):
                     echo '<div id="support" class="expresscurate_supportBlock expresscurate_masonryItem">
-                                        <label class="label">Support</label><div>';
+                                        <label class="label">' . __('Support') . '</label><div>';
                     if (!$sent) {
-                        echo '<label for="expresscurate_support_email">Leave your feedback</label>';
+                        echo '<label for="expresscurate_support_email">' . __('Leave your feedback') . '</label>';
                     } else {
-                        echo '<label for="expresscurate_support_email">Thanks for your feedback</label>';
+                        echo '<label for="expresscurate_support_email">' . __('Thanks for your feedback') . '</label>';
                     }
                     echo '<form method="post" action="' . get_admin_url() . 'admin.php?page=expresscurate"

expresscurate/trunk/templates/dialog.php

@@ -16 +16 @@
                            id="expresscurate_clone_source" name="expresscurate_source"
                            value="<?php echo @get_post_meta($post->ID, 'expresscurate_source', true); ?>">
-                    <button class="load" id="expresscurate_submit">Load</button>
-                    <button class="load expresscurate_displayNone" id="expresscurate_clone">Clone</button>
+                    <button class="load" id="expresscurate_submit"><?php _e('Load'); ?></button>
+                    <button class="load expresscurate_displayNone" id="expresscurate_clone"><?php _e('Clone') ?></button>
                 </div>
                 <div class="title">
@@ -32 +32 @@
                         <div class="sizeX active">
                             <div class="tooltipWrap">
-                                <span>Large size</span>
+                                <span><?php _e('Large size'); ?></span>
                             </div>
                         </div>
                         <div class="sizeM">
                             <div class="tooltipWrap">
-                                <span>Middle size</span>
+                                <span><?php _e('Middle size'); ?></span>
                             </div>
                         </div>
                         <div class="sizeS">
                             <div class="tooltipWrap">
-                                <span>Small size</span>
+                                <span><?php _e('Small size'); ?></span>
                             </div>
                         </div>
@@ -48 +48 @@
                         <div class="prevImg prev">
                             <div class="tooltipWrap">
-                                <span>Previous</span>
+                                <span><?php _e('Previous'); ?></span>
                             </div>
                         </div>
                         <div class="nextImg next">
                             <div class="tooltipWrap">
-                                <span>Next</span>
+                                <span><?php _e('Next'); ?></span>
                             </div>
                         </div>
@@ -59 +59 @@
                         <div class="alignleft imgAlign">
                             <div class="tooltipWrap">
-                                <span>Align left</span>
+                                <span><?php _e('Align left'); ?></span>
                             </div>
                         </div>
                         <div class="alignnone active imgAlign">
                             <div class="tooltipWrap">
-                                <span>Fit to center</span>
+                                <span><?php _e('Fit to center'); ?></span>
                             </div>
                         </div>
                         <div class="alignright imgAlign">
                             <div class="tooltipWrap">
-                                <span>Align right</span>
+                                <span><?php _e('Align right') ?></span>
                             </div>
                         </div>
@@ -113 +113 @@
             <ul class="labels" id="curated_tags">
                 <li class="markButton expresscurate_displayNone expresscurate_preventTextSelection">
-                    <span>mark keywords</span></li>
+                    <span><?php _e('mark keywords'); ?></span></li>
             </ul>
             <div class="clear"></div>
@@ -158 +158 @@
 </script>
 <script type="text/html" id="tmpl-dialogMarkButton">
-    <li class="markButton expresscurate_preventTextSelection"><span>mark keywords</span></li>
+    <li class="markButton expresscurate_preventTextSelection"><span><?php _e('mark keywords'); ?></span></li>
 </script>
 <script type="text/html" id="tmpl-dialogInsertTags">
@@ -166 +166 @@
 <script type="text/html" id="tmpl-dialogSearchParagraphs">
     <li class="expresscurate_preventTextSelection expresscurate_dialog_shortPar expresscurate_shortParInactiveColor">
-        <label>Short Paragraphs</label>
+        <label><?php _e('Short Paragraphs'); ?></label>
         <span class="shortPButton shortPButtonInactive"><span></span></span>
     </li>
@@ -181 +181 @@
 </script>
 <script type="text/html" id="tmpl-dialogCuratedDescription">
-    <li id="curated_description" title="{{data}}">Description</li>
+    <li id="curated_description" title="{{data}}"><?php _e('Description'); ?></li>
 </script>
 <script type="text/html" id="tmpl-socialPostDialog">

expresscurate/trunk/templates/faq.php

@@ -21 +21 @@
 <div class="expresscurate_faq wrap">
     <div class="expresscurate_headBorderBottom expresscurate_OpenSansRegular">
-        <h2>FAQ</h2>
-        <!--<label>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sagittis nulla lectus,</label>-->
+        <h2><?php _e('FAQ'); ?></h2>
     </div>
-    <h2 class="expresscurate_displayNone">FAQ</h2>
+    <h2 class="expresscurate_displayNone"><?php _e('FAQ'); ?></h2>
 
     <div>
@@ -43 +42 @@
                 <div class="inlineBlock">
                     <a class="questionBox moreQuestions" href="http://news.expresscurate.com/category/faq/"
-                       target="_blank"><span>More questions</span></a>
+                       target="_blank"><span><?php _e('More questions'); ?></span></a>
                 </div>
             <?php } else {
@@ -49 +48 @@
                 <div class="inlineBlock">
                     <a class="questionBox moreQuestions" href="http://news.expresscurate.com/category/faq/"
-                       target="_blank"><span>Visit our faq blog</span></a>
+                       target="_blank"><span><?php _e('Visit our faq blog'); ?></span></a>
                 </div>
             <?php }
@@ -56 +55 @@
         <div class="block">
             <?php if (!$sent) { ?>
-                <label for="expresscurate_support_email">Ask a question</label>
+                <label for="expresscurate_support_email"><?php _e('Ask a question'); ?></label>
             <?php
             } else {
                 ?>
-                <label for="expresscurate_support_email">Your question has been sent</label>
+                <label for="expresscurate_support_email"><?php _e('Your question has been sent'); ?></label>
             <?php
             }
@@ -69 +68 @@
                            placeholder="Email"
                            value="<?php echo $user_email ?>"/>
-                    <span>Please make sure to provide a working email address so that we can respond back to your support issue.</span>
+                    <span><?php _e('Please make sure to provide a working email address so that we can respond back to your support issue.'); ?></span>
                     <span id="expresscurate_support_email_validation" class="expresscurate_errorMessage"></span>
                 </div>
@@ -77 +76 @@
                     <span id="expresscurate_support_message_validation" class="expresscurate_errorMessage"></span>
                 </div>
-                <a class="askButton send greenBackground" href="#">Ask</a>
+                <a class="askButton send greenBackground" href="#"><?php _e('Ask'); ?></a>
             </form>
         </div>

expresscurate/trunk/templates/feed_dashboard.php

@@ -7 +7 @@
 <div class="expresscurate_feed_dashboard expresscurate_Styles wrap">
     <div class="expresscurate_headBorderBottom expresscurate_headerPart expresscurate_OpenSansRegular">
-        <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs">Suggestions? <span>Submit here!</span></a>
+        <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs"><?php _e('Suggestions? '); ?><span><?php _e('Submit here!'); ?></span></a>
 
-        <h2>RSS Feeds</h2>
+        <h2><?php _e('RSS Feeds'); ?></h2>
 
         <div class="pageDesc">
-            Manage RSS feeds to customize the content that gets delivered to your ExpressCurate Content Feed.
+<?php _e('Manage RSS feeds to customize the content that gets delivered to your ExpressCurate Content Feed.'); ?>
         </div>
     </div>
     <div class="expresscurate_content_wrapper whiteWrap">
         <ul class="expresscurate_columnsName">
-            <li class="mainTitle">RSS feeds</li>
-            <li class="title expresscurate_floatRight"># of curated posts</li>
+            <li class="mainTitle"><?php _e('RSS feeds'); ?></li>
+            <li class="title expresscurate_floatRight"><?php _e('# of curated posts'); ?></li>
         </ul>
-        <label class="expresscurate_displayNone expresscurate_notDefined">There is no enough data</label>
+        <label class="expresscurate_displayNone expresscurate_notDefined"><?php _e('There is no enough data'); ?></label>
         <ul class="expresscurate_feedSettingsList">
             <?php
@@ -39 +39 @@
         </ul>
         <div class="addNewFeed">
-            <label for="addFeed ">Add RSS feed</label>
+            <label for="addFeed "><?php _e('Add RSS feed'); ?></label>
 
             <div class="addFeed">

expresscurate/trunk/templates/feed_list.php

@@ -47 +47 @@
     } ?>">
     <div class="expresscurate_headBorderBottom expresscurate_OpenSansRegular">
-        <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs">Suggestions? <span>Submit here!</span></a>
-
-        <h2>Content Feed</h2>
+        <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs"><?php _e('Suggestions? '); ?><span><?php _e('Submit here!'); ?></span></a>
+
+        <h2><?php _e('Content Feed'); ?></h2>
 
         <div class="pageDesc">
-            Content Feed brings content from your RSS feeds directly into ExpressCurate, providing you a convenient
+<?php _e('Content Feed brings content from your RSS feeds directly into ExpressCurate, providing you a convenient
             starting point
             for writing your curated posts. Pick an article (or multiple articles) and click on the curate button to
-            create a post.
+            create a post.'); ?>
         </div>
         <div class="controlsWrap">
             <ul class="feedListControls expresscurate_preventTextSelection expresscurate_controls ">
                 <li class="check">
-                    <span class="tooltip">select / deselect</span>
+                    <span class="tooltip"><?php _e('select / deselect'); ?></span>
                 </li>
                 <select name="expresscurate_keywordFilter" id="expresscurate_keywordFilter">
-                    <option value="none" selected>Fillter by keyword</option>
+                    <option value="none" selected><?php _e('Fillter by keyword'); ?></option>
                     <?php foreach($keywords as $keyword){ ?>
                         <option class="expresscurate_filterOption" value="<?php echo $keyword; ?>"><?php echo $keyword; ?></option>
@@ -70 +70 @@
                 <br class="second"/>
                 <select name="expresscurate_blogFilter" id="expresscurate_blogFilter">
-                    <option value="none" selected>Filter by blog</option>
+                    <option value="none" selected><?php _e('Filter by blog'); ?></option>
                     <?php foreach($domains as $domain){ ?>
                         <option class="expresscurate_filterOption" value="<?php echo $domain; ?>"><?php echo $domain; ?></option>
@@ -77 +77 @@
                 <br class="first"/>
                 <li class="remove expresscurate_floatRight">
-                    <span class="tooltip">delete</span>
+                    <span class="tooltip"><?php _e('delete'); ?></span>
                 </li>
                 <li class="bookmark expresscurate_floatRight">
-                    <span class="tooltip">bookmark</span>
+                    <span class="tooltip"><?php _e('bookmark'); ?></span>
                 </li>
                 <li class="quotes expresscurate_floatRight">
-                    <span class="tooltip">curate</span>
+                    <span class="tooltip"><?php _e('curate'); ?></span>
                 </li>
                 <br class="second"/>
                 <?php if (strlen(get_option('expresscurate_links_rss', '')) > 2) { ?>
                     <li class="pull active expresscurate_floatRight">
-                        <span class="tooltip">pull</span>
+                        <span class="tooltip"><?php _e('pull'); ?></span>
                         <span class="loading"></span>
                     </li>
                     <li class="pullTime active expresscurate_floatRight">
-                        next update:
+                        <?php _e('next update:'); ?>
                         <p>in <?php echo $nextPullTime; ?></p>
                     </li>
@@ -99 +99 @@
                 <a href="?page=expresscurate_content_feed_archive">
                     <li class="linkToDeletedPosts expresscurate_floatRight">
-                        <span class="tooltip">Content Feed Archive</span>
+                        <span class="tooltip"><?php _e('Content Feed Archive'); ?></span>
                     </li>
                 </a>
@@ -105 +105 @@
                 <li class="layout expresscurate_floatRight">
                     <span class="tooltip"><?php if (get_option('expresscurate_bookmark_layout', '') == 'single') {
-                            echo 'view as grid';
+                             _e('view as grid');
                         } else {
-                            echo 'view as list';
+                            _e('view as list');
                         } ?></span>
                 </li>
@@ -148 +148 @@
                             <li class="expresscurate_keyword <?php echo $color ?>"><?php echo $keyword; ?>
                                 <span class="tooltip">
-                      <div class="<?php echo $color ?>">Keyword match</div>
+                      <div class="<?php echo $color ?>"><?php _e('Keyword match'); ?></div>
                     <span class="inTitle">title<p class=""><?php echo $stats['title'] ?></p></span><!--inTitle yes|no-->
                     <span class="inContent">content<p><?php echo $stats['percent'] * 100 ?>%</p></span>
@@ -175 +175 @@
                         if (get_option('expresscurate_social_publishing', '') == "on" && strlen(get_option('expresscurate_buffer_access_token')) > 2) {
                     ?>
-                        <li class="share">Share </li>
+                        <li class="share"><?php _e('Share '); ?></li>
                         <li class="separator">-</li>
                     <?php } ?>
-                    <li class="bookmark">Bookmark</li>
+                    <li class="bookmark"><?php _e('Bookmark') ?></li>
                     <li class="separator">-</li>
-                    <li class="hide">Delete</li>
+                    <li class="hide"><?php _e('Delete'); ?></li>
 
                 </ul>
                 <div class="expresscurate_clear"></div>
-                <!--<span class="label label_<?php /*echo $item['type'] */ ?>"><?php /*echo $item['type'] */ ?></span>-->
             </li>
 

expresscurate/trunk/templates/keywords.php

@@ -8 +8 @@
     <input type="hidden" id="expresscurate_plugin_dir" value="<?php echo plugin_dir_url(__FILE__); ?>"/>
     <label>Keywords Dashboard</label>
-    <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs">Suggestions?
-        <span>Submit here!</span></a>
+    <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs"><?php _e('Suggestions? '); ?>
+        <span><?php _e('Submit here!'); ?></span></a>
     <br/>
-    <label class="pageDescription pageDesc">Monitor and manage keyword utilization in your blog.</label>
+    <label class="pageDescription pageDesc"><?php _e('Monitor and manage keyword utilization in your blog.') ?></label>
 
     <div class="expresscurate_clear"></div>
@@ -18 +18 @@
         <div class="keywordsPart">
             <div>
-                <label class="blockTitle expresscurate_color_lightGreen">Keywords</label>
-                <label class="colTitle expresscurate_margin30 expresscurate_floatRight"># of posts</label>
-                <label class="colTitle expresscurate_margin15 expresscurate_floatRight">in content</label>
-                <label class="colTitle expresscurate_margin30 expresscurate_floatRight">in title</label>
+                <label class="blockTitle expresscurate_color_lightGreen"><?php _e('Keywords'); ?></label>
+                <label class="colTitle expresscurate_margin30 expresscurate_floatRight"><?php _e('# of posts'); ?></label>
+                <label class="colTitle expresscurate_margin15 expresscurate_floatRight"><?php _e('in content'); ?></label>
+                <label class="colTitle expresscurate_margin30 expresscurate_floatRight"><?php _e('in title'); ?></label>
 
                 <div class="expresscurate_clear"></div>
-                <label class="expresscurate_displayNone expresscurate_notDefined">Add your keywords in the box
-                    below.</label>
+                <label class="expresscurate_displayNone expresscurate_notDefined"><?php _e('Add your keywords in the box
+                    below.'); ?></label>
                 <ul>
                     <?php
@@ -50 +50 @@
             <div class="legend expresscurate_floatLeft">
                 <span id="blue" class="expresscurate_blue"></span>
-                <label for="blue"><3%<span>Usage is low</span></label>
+                <label for="blue"><3%<span><?php _e('Usage is low'); ?></span></label>
                 <span id="green" class="expresscurate_green"></span>
-                <label for="green">3-5% <span>Usage is good</span></label>
+                <label for="green">3-5% <span><?php _e('Usage is good'); ?></span></label>
                 <span id="red" class="expresscurate_red"></span>
-                <label for="red">>5%<span>Too many occurances</span></label>
+                <label for="red">>5%<span><?php _e('Too many occurances'); ?></span></label>
             </div>
-            <a href="https://www.google.com/alerts" class="googleAlert expresscurateLink expresscurate_floatRight">Create
-                Google Alert</a>
+            <a href="https://www.google.com/alerts" class="googleAlert expresscurateLink expresscurate_floatRight"><?php _e('Create
+                Google Alert'); ?></a>
 
             <div class="expresscurate_clear"></div>
             <div class="addNewKeyword">
-                <label for="addKeyword">Add new keyword</label>
+                <label for="addKeyword"><?php _e('Add new keyword'); ?></label>
                 <textarea id="expresscurate_defined_tags" class="expresscurate_displayNone"
                           name="expresscurate_defined_tags"><?php echo get_option('expresscurate_defined_tags', '') ?> </textarea>
@@ -74 +74 @@
                 <p class="expresscurate_errorMessage"></p>
                 <div class="expresscurate_clear"></div>
-                <p><span>Recommendation: </span>avoid using stop words like: </br>
+                <p><span><?php _e('Recommendation: '); ?></span>avoid using stop words like: </br>
                     ain’t, all, is, at, on, which, etc. </p>
             </div>
         </div>
         <div class="usedWordsPart">
-            <label class="blockTitle">Top words</label>
+            <label class="blockTitle"><?php _e('Top words'); ?></label>
 
             <div class="expresscurate_clear"></div>
-            <div class="expresscurate_topWordsDesc">List of most frequently used words in your blog. Pick the “+” sign
-                to turn them into target keywords.
+            <div class="expresscurate_topWordsDesc"><?php _e('List of most frequently used words in your blog. Pick the “+” sign
+                to turn them into target keywords.'); ?>
             </div>
 
-            <label class="colTitle expresscurate_margin35 expresscurate_floatRight">in content</label>
-            <label class="colTitle expresscurate_margin35 expresscurate_floatRight">in title</label>
-            <label class="expresscurate_displayNone expresscurate_notDefined">There is no top words data at this time.
-                Please check again later.</label>
+            <label class="colTitle expresscurate_margin35 expresscurate_floatRight"><?php _e('in content'); ?></label>
+            <label class="colTitle expresscurate_margin35 expresscurate_floatRight"><?php _e('in title'); ?></label>
+            <label class="expresscurate_displayNone expresscurate_notDefined"><?php _e('There is no top words data at this time.
+                Please check again later.'); ?></label>
             <ul>
                 <?php

expresscurate/trunk/templates/news.php

@@ -1 +1 @@
 <div class="expresscurate_Styles wrap ">
     <div class="expresscurate_headBorderBottom expresscurate_OpenSansRegular">
-        <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs">Suggestions? <span>Submit here!</span></a>
+        <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs"><?php _e('Suggestions? '); ?><span><?php _e('Submit here!'); ?></span></a>
         <h2>News</h2>
     </div>

expresscurate/trunk/templates/settings.php

@@ -1 +1 @@
 <div class="expresscurate expresscurate_Styles expresscurate_settings wrap">
     <div class="expresscurate_headBorderBottom expresscurate_OpenSansRegular">
-        <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs">Suggestions?
-            <span>Submit here!</span></a>
-
-        <h2>Settings</h2>
+        <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs"><?php _e('Suggestions?'); ?>
+            <span><?php _e('Submit here!'); ?></span></a>
+
+        <h2><?php _e('Settings'); ?></h2>
     </div>
-    <h2 class="expresscurate_displayNone">Settings</h2>
+    <h2 class="expresscurate_displayNone"><?php _e('Settings'); ?></h2>
     <?php
     $expresscurate_seo = get_option('expresscurate_seo', '') == "on" ? 'On' : 'Off';
     ?>
     <ul class="tabs" data-currenttab="<?php echo $_SESSION['settings_current_tab'] ?>">
-        <li class="tab-link expresscurate_preventTextSelection green current" data-tab="tab-1">General</li>
-        <li class="tab-link expresscurate_preventTextSelection orange" data-tab="tab-5">Feed</li>
-        <li class="tab-link expresscurate_preventTextSelection red" data-tab="tab-2">Smart publishing</li>
+        <li class="tab-link expresscurate_preventTextSelection green current" data-tab="tab-1"><?php _e('General'); ?></li>
+        <li class="tab-link expresscurate_preventTextSelection orange" data-tab="tab-5"><?php _e('Feed'); ?></li>
+        <li class="tab-link expresscurate_preventTextSelection red" data-tab="tab-2"><?php _e('Smart publishing'); ?></li>
         <li id="sitemapTab"
             class="tab-link expresscurate_preventTextSelection blue <?php if ($expresscurate_seo == 'Off') {
@@ -21 +21 @@
             data-tab="tab-3">Sitemap
         </li>
-        <li class="tab-link expresscurate_preventTextSelection yellow" data-tab="tab-4">Extension</li>
+        <li class="tab-link expresscurate_preventTextSelection yellow" data-tab="tab-4"><?php _e('Extension'); ?></li>
     </ul>
 
@@ -31 +31 @@
                 <ul>
                     <li>
-                        <div class="title">Image Placement
+                        <div class="title"><?php _e('Image Placement'); ?>
                             <div class="description">
-                                There are two options for placing the images (picked from the original article) in your
-                                curated post:
+                                <?php _e('There are two options for placing the images (picked from the original article) in your
+                                curated post:'); ?>
                                 <ol>
-                                    <li>Featured. The image will be placed above the title, at the very top of your
+                                    <li><?php _e('Featured. The image will be placed above the title, at the very top of your
                                         post. This will give
-                                        your image a more prominent look.
+                                        your image a more prominent look.'); ?>
                                     </li>
-                                    <li>Standard. The image will be placed below the title and category. This option
+                                    <li><?php _e('Standard. The image will be placed below the title and category. This option
                                         will focus your
-                                        viewer's attention more on the title and less on the image.
+                                        viewer\'s attention more on the title and less on the image.'); ?>
                                     </li>
                                 </ol>
@@ -66 +66 @@
                     </li>
                     <li>
-                        <label for="expresscurate_curated_text" class="title">Attribution Text For Original Article Link<span
+                        <label for="expresscurate_curated_text" class="title"><?php _e('Attribution Text For Original Article Link<span
                                 class="description">Type in the prefix text for attributing the original article link.
             It will show up at the bottom of your curated post.  For example, if you type "Curated from"
-            in the box below and you curate from google.com, "Curated from google.com" will appear at the bottom of your post.</span>
+            in the box below and you curate from google.com, "Curated from google.com" will appear at the bottom of your post'); ?>.</span>
                         </label>
                         <input type="text" class="controls" id="expresscurate_curated_text" value="<?php
@@ -80 +80 @@
                     </li>
                     <li>
-                        <p class="title">Open Original Article Link in a New Window/Tab<span scope="row"
-                                                                                             class="description  ">
-            Select "Yes" if you want the original article link to be opened in a New Window/Tab. Select "No" if you want the link to be opened in the Same Window/Tab (default behavior).
+                        <p class="title"><?php _e('Open Original Article Link in a New Window/Tab'); ?><span scope="row"
+                                                                                             class="description  "><?php _e('
+            Select "Yes" if you want the original article link to be opened in a New Window/Tab. Select "No" if you want the link to be opened in the Same Window/Tab (default behavior).'); ?>
           </span></p>
 
@@ -95 +95 @@
                     </li>
                     <li>
-                        <label for="expresscurate_max_tags" class="title">Max Number of Auto-suggested Tags<span
-                                class="description">&nbsp;&nbsp; The recommended value is 3.<br/>
-        <span>ExpressCurate can auto-suggest tags for your post. It is based on the keywords and tags defined in your prior WordPress blogs. Enter the max number of auto-suggested tags you would like to have in each curated posts.</span>
+                        <label for="expresscurate_max_tags" class="title"><?php _e('Max Number of Auto-suggested Tags');?><span
+                                class="description">&nbsp;&nbsp; <?php _e('The recommended value is 3.'); ?><br/>
+        <span><?php _e('ExpressCurate can auto-suggest tags for your post. It is based on the keywords and tags defined in your prior WordPress blogs. Enter the max number of auto-suggested tags you would like to have in each curated posts.'); ?></span>
                         </label>
                         <input type="text" id="expresscurate_max_tags" class="controls" value="<?php
@@ -110 +110 @@
                     </li>
                     <li>
-                        <label for="expresscurate_autosummary" class="title">Number of Curated Paragraphs<span
-                                class="description  ">Pick the number of paragraphs to be inserted from the original article into your post.</span>
-                            <br/><span>&nbsp;&nbsp; The default value is 5</span></label>
+                        <label for="expresscurate_autosummary" class="title"><?php _e('Number of Curated Paragraphs'); ?><span
+                                class="description  "><?php _e('Pick the number of paragraphs to be inserted from the original article into your post.'); ?></span>
+                            <br/><span>&nbsp;&nbsp; <?php _e('The default value is 5');?></span></label>
                         <input type="text" id="expresscurate_autosummary" class="controls" value="<?php
                         $autosummary = get_option('expresscurate_autosummary');
@@ -124 +124 @@
                     </li>
                     <li>
-                        <p class="title">Enable ExpressCurate Blockquote<span class="description  ">
-            Select "Yes" to use ExpressCurate blockquote for marking the original content quote. Select "No" if you are already using a theme that has a good enough quote style and ExpressCurate won't override it.
+                        <p class="title"><?php _e('Enable ExpressCurate Blockquote'); ?><span class="description  ">
+            <?php _e('Select "Yes" to use ExpressCurate blockquote for marking the original content quote. Select "No" if you are already using a theme that has a good enough quote style and ExpressCurate won\'t override it.');?>
           </span></p>
                         <input class="expresscurate_displayNone" type="checkbox" id="quotes_style"
@@ -136 +136 @@
                     </li>
                     <li>
-                        <p class="title">SEO Enhancements<span scope="row" class="description  ">
-            Click on "Yes" to enable ExpressCurate SEO enhancements for your curated post.
+                        <p class="title"><?php _e('SEO Enhancements'); ?><span scope="row" class="description  ">
+            <?php _e('Click on "Yes" to enable ExpressCurate SEO enhancements for your curated post.'); ?>
           </span></p>
 
@@ -154 +154 @@
                         }
                         ?> />">
-                            <label for="expresscurate_publusher" class="title">Publisher (Google+)<span
-                                    class="description  ">You can link content you publish on this blog to your company or personal Google+ profile.
-                <a href="https://plus.google.com/authorship" target="_blank">More Info</a>.</label></span>
+                            <label for="expresscurate_publusher" class="title"><?php _e('Publisher (Google+)'); ?><span
+                                    class="description  "><?php _e('You can link content you publish on this blog to your company or personal Google+ profile.'); ?>
+                <a href="https://plus.google.com/authorship" target="_blank"><?php _e('More Info'); ?></a>.</label></span>
 
                             <input class="controls" type="text" id="expresscurate_publusher" size="50" value="<?php
@@ -167 +167 @@
                             <a class="expresscurateLink verifyPublisherLink expresscurate_marginleft10"
                                href="http://www.google.com/webmasters/tools/richsnippets?url=<?php echo bloginfo('url') ?>&user_profile=<?php echo get_option('expresscurate_publisher'); ?>"
-                               target="_blank">Verify publisher</a>
+                               target="_blank"><?php _e('Verify publisher'); ?></a>
                             <br/>
-                            <label for="expresscurate_publisher_twitter" class="title">Publisher (Twitter)<span
-                                    class="description  ">You can link content you publish on this blog to your company or personal Twitter profile.
-                <a href="https://plus.google.com/authorship" target="_blank">More Info</a>.</label></span>
+                            <label for="expresscurate_publisher_twitter" class="title"><?php _e('Publisher (Twitter)'); ?><span
+                                    class="description  "><?php _e('You can link content you publish on this blog to your company or personal Twitter profile.'); ?>
+                <a href="https://plus.google.com/authorship" target="_blank"><?php _e('More Info'); ?></a>.</label></span>
 
                             <input class="controls" type="text" id="expresscurate_publisher_twitter" size="50"
@@ -183 +183 @@
 
                             <br/>
-                            <label for="expresscurate_publisher_facebook" class="title">Publisher (Facebook)<span
-                                    class="description  ">You can link content you publish on this blog to your company or personal Facebook profile.
+                            <label for="expresscurate_publisher_facebook" class="title"><?php _e('Publisher (Facebook)'); ?><span
+                                    class="description  "><?php _e('You can link content you publish on this blog to your company or personal Facebook profile.');?>
                 <a href="https://plus.google.com/authorship" target="_blank">More Info</a>.</label></span>
 
@@ -198 +198 @@
                     </li>
                     <li>
-                        <p class="title">Auto Hashtagging<span class="description  ">
-            Transform words starting with # into tags and add # to the words previously defined as tags.
+                        <p class="title"><?php _e('Auto Hashtagging'); ?><span class="description  ">
+            <?php _e('Transform words starting with # into tags and add # to the words previously defined as tags.'); ?>
           </span></p>
                         <?php
@@ -213 +213 @@
                     </li>
                     <li>
-                        <p class="title">Your Keyword Tags<span class="description  ">
-            Enter your target keywords that you want to be tagged in the post.  Multiple keywords need to be separated by commas.
-            <br/>When this list is defined, ExpressCurate will look for these words in curated content and try to tag them in the article, as well as create links from these keywords that show up on tag's page.</span>
+                        <p class="title"><?php _e('Your Keyword Tags'); ?><span class="description  ">
+            <?php _e('Enter your target keywords that you want to be tagged in the post.  Multiple keywords need to be separated by commas.'); ?>
+            <br/><?php _e('When this list is defined, ExpressCurate will look for these words in curated content and try to tag them in the article, as well as create links from these keywords that show up on tag\'s page.'); ?></span>
                         </p>
-                        <a class="expresscurateLink" href="admin.php?page=expresscurate_keywords">Keywords Dashboard</a>
+                        <a class="expresscurateLink" href="admin.php?page=expresscurate_keywords"><?php _e('Keywords Dashboard'); ?></a>
                     </li>
                     <!-- Number of posts  -->
                     <li>
-                        <p class="title"> Keyword Statistics.
+                        <p class="title"> <?php _e('Keyword Statistics.'); ?>
                             <span class="description">
                                Generates comprehensive keyword statistics for the last <?php echo(get_option('expresscurate_posts_number') ? get_option('expresscurate_posts_number') : 100); ?>
@@ -250 +250 @@
                 <ul>
                     <li>
-                        <p class="title">Smart publishing </p>
+                        <p class="title"><?php _e('Smart publishing '); ?></p>
                         <input class="expresscurate_displayNone" type="checkbox" id="expresscurate_publish"
                                name="expresscurate_publish" <?php
@@ -266 +266 @@
                         <div id="smartPublishingWrap" class="<?php echo $show_interval; ?>">
 
-                            <p class="title">Manually approve posts for smart publishing</p>
+                            <p class="title"><?php _e('Manually approve posts for smart publishing'); ?></p>
                             <?php
                             $expresscurate_manually_approve_smart = get_option('expresscurate_manually_approve_smart', '') == 'On' ? 'On' : 'Off';
@@ -281 +281 @@
                             <br/>
 
-                            <p class="title" for="expresscurate_hours_interval">Publish draft
-                                articles</p>
+                            <p class="title" for="expresscurate_hours_interval"><?php _e('Publish draft
+                                articles'); ?></p>
 
                             <select class="controls" id="expresscurate_hours_interval"
@@ -320 +320 @@
                     </li>
                     <li>
-                        <p class="title">Social publishing </p>
+                        <p class="title"><?php _e('Social publishing '); ?></p>
                         <input class="expresscurate_displayNone" type="checkbox" id="expresscurate_social_publishing"
                                name="expresscurate_social_publishing" <?php
@@ -402 +402 @@
                 <ul>
                     <li>
-                        <p class="title">Default Category for Curated Posts<span class="description  ">Please pick a default category for your curated posts from the list below. This will prevent a default "Uncategorized" being assigned to your post automatically.</span>
+                        <p class="title"><?php _e('Default Category for Curated Posts'); ?><span class="description  "><?php _e('Please pick a default category for your curated posts from the list below. This will prevent a default "Uncategorized" being assigned to your post automatically.'); ?></span>
                         </p>
 
@@ -436 +436 @@
                     </li>
                     <li>
-                        <p class="title">Post type for ExpressCurate Chrome Extension<span class="description  ">Please pick a post type for your curated posts from the list below. This will allow custom post types when curating with ExpressCurate Chrome Extension.</span>
+                        <p class="title"><?php _e('Post type for ExpressCurate Chrome Extension'); ?><span class="description  "><?php _e('Please pick a post type for your curated posts from the list below. This will allow custom post types when curating with ExpressCurate Chrome Extension.'); ?></span>
                         </p>
 
@@ -471 +471 @@
                     </li>
                     <li>
-                        <p class="title">Publishing Directly from ExpressCurate Chrome Extension<span
-                                class="description  ">This setting gives you an option to save your curated post as a draft or publish it when you click on the "Curate" button on ExpressCurate Chrome extension.</span>
+                        <p class="title"><?php _e('Publishing Directly from ExpressCurate Chrome Extension'); ?><span
+                                class="description  "><?php _e('This setting gives you an option to save your curated post as a draft or publish it when you click on the "Curate" button on ExpressCurate Chrome extension.'); ?></span>
                         </p>
 
@@ -493 +493 @@
                             ?> />
                             <label class="controls expresscurate_radioLabel" for="expresscurate_post_draft">
-                                Draft </label>
+<?php _e('Draft'); ?> </label>
                         </div>
                     </li>
@@ -511 +511 @@
                     <li>
                         <div class="title">
-                            Content Pull Frequency
+<?php _e('Content Pull Frequency'); ?>
                             <div class="description">
-                                How frequently should ExpressCurate pull content (from RSS feeds, Alerts, etc) into your
-                                <a href="#">Content Feed</a>?
+<?php _e('How frequently should ExpressCurate pull content (from RSS feeds, Alerts, etc) into your'); ?>
+                                <a href="#"><?php _e('Content Feed'); ?></a>?
                             </div>
                         </div>
@@ -554 +554 @@
                     <li>
                         <div class="title">
-                            Stop Keywords
+<?php _e('Stop Keywords'); ?>
                             <div class="description">
-                                ExpressCurate will filter out the posts that contain any stop keywords.
+<?php _e(' ExpressCurate will filter out the posts that contain any stop keywords.'); ?>
                             </div>
                         </div>
@@ -586 +586 @@
                     <li>
                         <div class="title">
-                            Keyword Match Email Alerts
+<?php _e('Keyword Match Email Alerts'); ?>
                             <div class="description">
-                                Would you like to receive email alerts when keyword matches are found in your <a
-                                    href="#">Content Feed</a>?
+<?php _e('Would you like to receive email alerts when keyword matches are found in your '); ?><a
+                                    href="#"><?php _e('Content Feed'); ?></a>?
                             </div>
                         </div>
@@ -600 +600 @@
                         <li>
                             <div class="title">
-                                Content Alert Frequency
+<?php _e('Content Alert Frequency'); ?>
                                 <div class="description">
-                                    How frequently should ExpressCurate send content Alert Emails (from RSS feeds,
+<?php _e('How frequently should ExpressCurate send content Alert Emails (from RSS feeds,
                                     Alerts,
-                                    etc)
+                                    etc)'); ?>
                                 </div>
                             </div>
@@ -645 +645 @@
                         <li>
                             <div class="title">
-                                Users
+<?php _e('Users'); ?>
                                 <div class="description">
-                                    Define who should get content alerts.
+<?php _e('Define who should get content alerts.'); ?>
                                 </div>
                             </div>

expresscurate/trunk/templates/sitemap.php

@@ -13 +13 @@
                 } else {
                     echo 'generated';
-                } ?>" id="submitSiteMap" href="#">Submit Sitemap<span class="loading"></span></a>
+                } ?>" id="submitSiteMap" href="#"><?php _e('Submit Sitemap'); ?><span class="loading"></span></a>
             </div>
-            <a class="generate" id="generateSiteMap" href="#">Generate Sitemap</a>
+            <a class="generate" id="generateSiteMap" href="#"><?php _e('Generate Sitemap'); ?></a>
         </li>
         <br/>
         <li>
-            <p class="title">Sitemap update frequency<span
-                    class="description ">How often should the sitemap be updated?</span></p>
+            <p class="title"><?php _e('Sitemap update frequency'); ?><span
+                    class="description "><?php _e('How often should the sitemap be updated?'); ?></span></p>
             <select class="controls" name="expresscurate_sitemap_generation_interval">
                 <option value="always" <?php
@@ -50 +50 @@
 
         <li>
-            <p class="title">Include all new posts in sitemap?<span class="description ">All new posts will be included in your sitemap if this option is enabled</span>
+            <p class="title"><?php _e('Include all new posts in sitemap?'); ?><span class="description "><?php _e('All new posts will be included in your sitemap if this option is enabled'); ?></span>
             </p>
             <input class="expresscurate_displayNone" type="checkbox" id="expresscurate_sitemap_include_new_posts"
@@ -57 +57 @@
         </li>
         <li>
-            <p class="title">Include all new pages in sitemap?<span class="description ">All new pages will be included in your sitemap if this option is enabled</span>
+            <p class="title"><?php _e('Include all new pages in sitemap?'); ?><span class="description "><?php _e('All new pages will be included in your sitemap if this option is enabled'); ?></span>
             </p>
             <input class="expresscurate_displayNone" type="checkbox" id="expresscurate_sitemap_include_new_pages"
@@ -90 +90 @@
         ?>
         <li>
-            <p class="title">Sitemap manual priority value<span class="description ">Please select the priority for new posts in your sitemap</span>
+            <p class="title"><?php _e('Sitemap manual priority value'); ?><span class="description "><?php _e('Please select the priority for new posts in your sitemap'); ?></span>
             </p>
             <select class="controls" id="expresscurate_sitemap_priority_manual_value"
@@ -104 +104 @@
         </li>
         <li>
-            <p class="title">Sitemap default changefreq<span class="description ">Please select the sitemap changefreq value for your new posts</span>
+            <p class="title"><?php _e('Sitemap default changefreq'); ?><span class="description "><?php _e('Please select the sitemap changefreq value for your new posts'); ?></span>
             </p>
             <select class="controls" name="expresscurate_sitemap_default_changefreq">
@@ -117 +117 @@
         </li>
         <li>
-            <p class="title">Sitemap archiving frequency<span class="description ">Please select the frequency of archiving old post definitions in the sitemap</span>
+            <p class="title"><?php _e('Sitemap archiving frequency'); ?><span class="description "><?php _e('Please select the frequency of archiving old post definitions in the sitemap'); ?></span>
             </p>
             <select class="controls" name="expresscurate_sitemap_archiving">
@@ -143 +143 @@
         </li>
         <li class="expresscurate_sitemap_webmasters">
-            <p class="title">Submit sitemap automatically?<span class="description ">If this option is enabled, sitemap will be submitted to webmaster tools of search engines automatically.</span>
+            <p class="title"><?php _e('Submit sitemap automatically?'); ?><span class="description "><?php _e('If this option is enabled, sitemap will be submitted to webmaster tools of search engines automatically.'); ?></span>
             </p>
             <input class="expresscurate_displayNone" type="checkbox" id="expresscurate_sitemap_submit"
@@ -154 +154 @@
                 echo 'expresscurate_displayNone';
             } ?> />">
-                <p class="title">Registered domain in Google Search Console (aka Webmaster Tools)<span
-                        class="description">Specify if different from blog address</span></p>
+                <p class="title"><?php _e('Registered domain in Google Search Console (aka Webmaster Tools)'); ?><span
+                        class="description"><?php _e('Specify if different from blog address'); ?></span></p>
                 <input class="controls" type="text" name="expresscurate_sitemap_domain" id="expresscurate_sitemap_domain"
                        value="<?php echo get_option('expresscurate_sitemap_domain',''); ?>" placeholder="<?php echo get_site_url(); ?>">
                 <br>
-                <p class="title">Sitemap submission frequency<span class="description ">How often should sitemap be submitted to search engines?</span>
+                <p class="title"><?php _e('Sitemap submission frequency'); ?><span class="description "><?php _e('How often should sitemap be submitted to search engines?'); ?></span>
                 </p>
                 <select class="controls" name="expresscurate_sitemap_submit_frequency">
@@ -193 +193 @@
                     echo 'expresscurate_displayNone';
                 } ?>"
-                   href="https://www.expresscurate.com/api/connector/google/webmasters/refreshtoken/<?= $blogName ?>">Authorize
-                    access to Google Search Console (aka Webmaster Tools)</a>
+                   href="https://www.expresscurate.com/api/connector/google/webmasters/refreshtoken/<?= $blogName ?>"><?php _e('Authorize
+                    access to Google Search Console (aka Webmaster Tools)'); ?></a>
             </div>
         </li>

expresscurate/trunk/templates/social_posts_widget.php

@@ -29 +29 @@
 
     <ul class="mainControls">
-        <li id="expresscurate_addTweet" class="expresscurate_social_widget_buttons">New</li>
-        <li class="expresscurate_social_widget_buttons expresscurate_social_get_content">Get content</li>
-        <li data-header="h1" class="expresscurate_headerTweet expresscurate_social_widget_buttons">H1</li>
-        <li data-header="h2" class="expresscurate_headerTweet expresscurate_social_widget_buttons">H2</li>
-        <li data-header="h3" class="expresscurate_headerTweet expresscurate_social_widget_buttons">H3</li>
+        <li id="expresscurate_addTweet" class="expresscurate_social_widget_buttons"><?php _e('New'); ?></li>
+        <li class="expresscurate_social_widget_buttons expresscurate_social_get_content"><?php _e('Get content'); ?></li>
+        <li data-header="h1" class="expresscurate_headerTweet expresscurate_social_widget_buttons"><?php _e('H1'); ?></li>
+        <li data-header="h2" class="expresscurate_headerTweet expresscurate_social_widget_buttons"><?php _e('H2'); ?></li>
+        <li data-header="h3" class="expresscurate_headerTweet expresscurate_social_widget_buttons"><?php _e('H3'); ?></li>
 
         <?php if (!$socialPost) { ?>
-            <li id="expresscurate_socialTitlePost" class="expresscurate_social_widget_buttons">Social Title</li>
-            <li id="expresscurate_socialDescriptionPost" class="expresscurate_social_widget_buttons">Social
-                Description
+            <li id="expresscurate_socialTitlePost" class="expresscurate_social_widget_buttons"><?php _e('Social Title'); ?></li>
+            <li id="expresscurate_socialDescriptionPost" class="expresscurate_social_widget_buttons"><?php _e('Social
+                Description'); ?>
             </li>
-            <li id="expresscurate_socialShortDescriptionPost" class="expresscurate_social_widget_buttons">Social Short
-                Description
+            <li id="expresscurate_socialShortDescriptionPost" class="expresscurate_social_widget_buttons"><?php _e('Social Short
+                Description'); ?>
             </li>
         <?php } ?>
@@ -104 +104 @@
                 <span class="expresscurate_social_post_content_published"><?php echo $data['message']; ?></span>
                 <ul class="bottomControls">
-                    <li class="expresscurate_socialPostLength expresscurate_floatRight">Scheduled</li>
+                    <li class="expresscurate_socialPostLength expresscurate_floatRight"><?php _e('Scheduled'); ?></li>
                     <div class="expresscurate_clear"></div>
                 </ul>
@@ -135 +135 @@
                   id="">{{data.message}}</textarea>
         <ul class="bottomControls">
-            <li class="expresscurate_social_widget_buttons approve expresscurate_floatRight">Approve</li>
-            <li class="expresscurate_social_widget_buttons clone expresscurate_floatRight">Copy</li>
+            <li class="expresscurate_social_widget_buttons approve expresscurate_floatRight"><?php _e('Approve'); ?></li>
+            <li class="expresscurate_social_widget_buttons clone expresscurate_floatRight"><?php _e('Copy'); ?></li>
             <li class="expresscurate_socialPostLength expresscurate_floatRight {{data.errorColor}}">
                 {{data.postLength}}
             </li>
-            <li class="expresscurate_social_widget_buttons expresscurate_displayNone edit">Edit</li>
+            <li class="expresscurate_social_widget_buttons expresscurate_displayNone edit"><?php _e('Edit'); ?></li>
             <div class="expresscurate_clear"></div>
         </ul>

expresscurate/trunk/templates/sources_coll_widget.php

@@ -36 +36 @@
 
                     <div class="hover">
-                        <a class="curate expresscurate_curate">Curate</a><a class="delete">
-                            Delete</a>
+                        <a class="curate expresscurate_curate"><?php _e('Curate'); ?></a><a class="delete">
+                <?php _e('Delete'); ?></a>
                   <span class="tooltip">
-                    <p>Collected from</p>
+                    <p><?php _e('Collected from'); ?></p>
                     <a href="<?php echo $item['link'] ?>"><?php echo $item['domain'] ?></a>
                   </span>
@@ -50 +50 @@
         <!--add new-->
         <li class="addSource">
-            <span class="text">+ Add new source</span>
+            <span class="text"><?php _e('+ Add new source'); ?></span>
 
             <div>
@@ -65 +65 @@
 
             <div class="hover">
-                <a class="curate expresscurate_curate">Curate</a><a class="delete">Delete</a>
+                <a class="curate expresscurate_curate"><?php _e('Curate'); ?></a><a class="delete"><?php _e('Delete'); ?></a>
                             <span class="tooltip">
-                                <p>Collected from</p>
+                                <p><?php _e('Collected from'); ?></p>
                                 <a href="{{data.link}}" target="_newtab">{{data.domain}}</a>
                             </span>

expresscurate/trunk/templates/support.php

@@ -22 +22 @@
 <div class="expresscurate_support expresscurate_Styles wrap">
     <div class="expresscurate_headBorderBottom expresscurate_OpenSansRegular">
-        <h2>Support</h2>
+        <h2><?php _e('Support');?></h2>
     </div>
-    <h2 class="expresscurate_displayNone"> Support</h2>
+    <h2 class="expresscurate_displayNone"><?php _e('Support');?></h2>
 
     <div class="">
         <div class="block">
-            <label class="publicRevolution">Join the public curating revolution and leave a feedback by email or
-                twitter</label>
+            <label class="publicRevolution"><?php _e('Join the public curating revolution and leave a feedback by email or
+                twitter');?></label>
 
             <div>
-                <a href="mailto:[email protected]" class="feedbackButton redBackground">email</a>
-                <span>or</span>
-                <a href="https://twitter.com/CurateSupport" target="_blank" class="feedbackButton blueBackground">twitter</a>
+                <a href="mailto:[email protected]" class="feedbackButton redBackground"><?php _e('email');?></a>
+                <span><?php _e('or');?></span>
+                <a href="https://twitter.com/CurateSupport" target="_blank" class="feedbackButton blueBackground"><?php _e('twitter');?></a>
             </div>
-            <label class="margin10">Like ExpressCurate tools & want to support us?</label>
+            <label class="margin10"><?php _e('Like ExpressCurate tools & want to support us?');?></label>
             <a href="https://www.bit.ly/expresscuratedonate" target="_blank"
-               class="donate">donate</a>
+               class="donate"><?php _e('donate');?></a>
         </div>
         <div class="block">
             <?php if (!$sent) { ?>
-                <label for="expresscurate_support_email">Leave your feedback</label>
+                <label for="expresscurate_support_email"><?php _e('Leave your feedback');?></label>
             <?php
             } else {
                 ?>
-                <label for="expresscurate_support_email">Thanks for your feedback</label>
+                <label for="expresscurate_support_email"><?php _e('Thanks for your feedback');?></label>
             <?php
             }
@@ -56 +56 @@
                            placeholder="Email"
                            value="<?php echo $user_email ?>"/>
-                    <label>Please make sure to provide a working email address so that we can respond back to your support issue.</label>
+                    <label><?php _e('Please make sure to provide a working email address so that we can respond back to your support issue.'); ?></label>
                     <span id="expresscurate_support_email_validation" class="expresscurate_errorMessage"></span>
                 </div>
@@ -64 +64 @@
                     <span class="expresscurate_errorMessage" id="expresscurate_support_message_validation"></span>
                 </div>
-                <a class="feedbackButton send greenBackground" href="#">Send</a>
+                <a class="feedbackButton send greenBackground" href="#"><?php _e('Send');?></a>
             </form>
         </div>

expresscurate/trunk/templates/websites.php

@@ -5 +5 @@
 <div class="expresscurate_topSources expresscurate_Styles wrap">
   <div class="expresscurate_headBorderBottom expresscurate_headerPart expresscurate_OpenSansRegular">
-    <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs">Suggestions? <span>Submit here!</span></a>
-    <h2>Top Sources</h2>
-      <label class="pageDesc">Top sources where you have curated from.</label>
+    <a href="admin.php?page=expresscurate_support" class="expresscurate_writeUs"><?php _e('Suggestions? ');?><span><?php _e('Submit here!');?></span></a>
+    <h2><?php _e(' Sources');?></h2>
+      <label class="pageDesc"><?php _e('Top sources where you have curated from.');?></label>
   </div>
   <div class="expresscurate_content_wrapper">
@@ -14 +14 @@
       ?>
       <ul class="expresscurate_columnsName">
-        <li class="mainTitle">Sources</li>
-        <li class="title expresscurate_floatRight">rss subscription status</li>
-        <li class="title expresscurate_floatRight expresscurate_marginRight30"># of curated posts</li>
+        <li class="mainTitle"><?php _e('Sources');?></li>
+        <li class="title expresscurate_floatRight"><?php _e('rss subscription status');?></li>
+        <li class="title expresscurate_floatRight expresscurate_marginRight30"><?php _e('# of curated posts');?></li>
       </ul>
       <ul class="expresscurate_URL">
@@ -45 +45 @@
       ?>
       <span class="expresscurate_notDefined">
-        No Curated Post. <a href="<?php echo admin_url(); ?>post-new.php">Curate New Post Now</a>.
+      <?php _e(' No Curated Post.'); ?> <a href="<?php echo admin_url(); ?>post-new.php"><?php _e('Curate New Post Now'); ?></a>.
       </span>
     <?php }

expresscurate/trunk/templates/widget.php

@@ -5 +5 @@
 <div id="expresscurate_widget_wrapper"
      class="expresscurate_widget_wrapper expresscurate_Styles expresscurate_preventTextSelection">
-    <label>Keywords <span class="rotate"><a href="#"></a></span>
-        <span class="mark"><span>mark keywords</span></span>
+    <label><?php _e('Keywords '); ?><span class="rotate"><a href="#"></a></span>
+        <span class="mark"><span><?php _e('mark keywords');?></span></span>
     </label>
     <?php
@@ -49 +49 @@
     ?>
     <div class="description">
-        <label for="description">Description</label>
+        <label for="description"><?php _e('Description');?></label>
 
         <div class="descriptionWrap textareaBorder">
@@ -63 +63 @@
         </div>
         <div class="hint expresscurate_displayNone borderRight">
-            <span>characters left</span>
+            <span><?php _e('characters left');?></span>
 
             <p class="lettersCount"><span class="bold">156</span> / 156</p>
-            <span class="tooltip">The meta description will be limited to 156 chars.</span>
+            <span class="tooltip"><?php _e('The meta description will be limited to 156 chars.');?></span>
         </div>
         <div class="hint expresscurate_displayNone">
@@ -72 +72 @@
 
             <p class="usedKeywordsCount"><span class="bold">0</span> / 0</p>
-            <span class="tooltip">It'll be better to use keywords in meta description.</span>
+            <span class="tooltip"><?php _e('It\'ll be better to use keywords in meta description.');?></span>
         </div>
 
-        <p class="expresscurate_displayNone">The meta description tag is intented to be a brief and concise summary of
+        <p class="expresscurate_displayNone"><?php _e('The meta description tag is intented to be a brief and concise summary of
             your
-            page's content.</p>
+            page\'s content.');?></p>
     </div>
 
-    <a href="#" class="expresscurate_moveToAdvanced">Advanced SEO</a>
+    <a href="#" class="expresscurate_moveToAdvanced"><?php _e('Advanced SEO');?></a>
 <?php } ?>
 <script type="text/html" id="tmpl-SEOControlCenter">
@@ -87 +87 @@
         <div data-color="{{data.color}}" class="statisticsTitle expresscurate_{{data.color}}"><span>{{data.keyword}}</span></div>
         <div class="statistics {{data.inTitle}} borderRight">
-            <div class="center">title</div>
+            <div class="center"><?php _e('title');?></div>
         </div>
         <div class="statistics">
-            <div class="center">content<span>{{data.inContent}}%</span></div>
+            <div class="center"><?php _e('content');?><span>{{data.inContent}}%</span></div>
         </div>
     </div>