Merge pull request #658 from bttrx/patch-4

Fixes i18n and unordered list; Provides i18n for feed error messages by @bttrx

lang/en_US.ini

@@ -287,3 +287,6 @@ Archive_page_for = "Archive page for"
 Posts_with_type = "Posts with type"
 ;Search
 Search_results_for = "Search results for"
+;Feed
+Cannot_read_feed_content = "Cannot read feed content"
+Unknown_feed_format = "Unknown feed format"

system/admin/admin.php

@@ -44,7 +44,7 @@ function session($user, $pass)
 {
     $user_file = 'config/users/' . $user . '.ini';
     if (!file_exists($user_file)) {
-        return $str = '<div class="error-message"><ul><li class="alert alert-danger">' . i18n('Invalid_Error') . '</li></li></div>';
+        return $str = '<div class="error-message"><ul><li class="alert alert-danger">' . i18n('Invalid_Error') . '</li></ul></div>';
     }
 
     $user_enc = user('encryption', $user);
@@ -60,7 +60,7 @@ function session($user, $pass)
             $_SESSION[config("site.url")]['user'] = $user;
             header('location: admin');
         } else {
-            return $str = '<div class="error-message"><ul><li class="alert alert-danger">ERROR: Invalid username or password.</li></li></div>';
+            return $str = '<div class="error-message"><ul><li class="alert alert-danger">' . i18n('Invalid_Error') . '</li></ul></div>';
         }
     } else if (old_password_verify($pass, $user_enc, $user_pass)) {
         if (session_status() == PHP_SESSION_NONE) session_start();
@@ -68,7 +68,7 @@ function session($user, $pass)
         $_SESSION[config("site.url")]['user'] = $user;
         header('location: admin');
     } else {
-        return $str = '<div class="error-message"><ul><li class="alert alert-danger">ERROR: Invalid username or password.</li></li></div>';
+        return $str = '<div class="error-message"><ul><li class="alert alert-danger">' . i18n('Invalid_Error') . '</li></ul></div>';
     }
 }
 
@@ -854,7 +854,7 @@ function get_feed($feed_url, $credit)
             } elseif (!empty($descriptionB)) {
                 $content = preg_replace('#<br\s*/?>#i', "\n", $descriptionB);
             } else {
-                return $str = '<li>Can not read the feed content.</li>';
+                return $str = '<li>' . i18n('Cannot_read_feed_content') . '</li>';
             }
             $time = new DateTime($entry->pubDate);
             $timestamp = $time->format("Y-m-d H:i:s");
@@ -872,7 +872,7 @@ function get_feed($feed_url, $credit)
             migrate($title, $time, $tags, $content, $url, $user, $source);
         }
     } else {
-        return $str = '<li>Unsupported feed.</li>';
+        return $str = '<li>' . i18n('Unknown_feed_format') . '</li>';
     }
 }
 
@@ -1002,4 +1002,4 @@ function replace_key($arr, $oldkey, $newkey) {
         return array_combine($keys, $arr);    
     }
     return $arr;    
-}
+}