Merge pull request #512 from vallyol/master

Lang update by @vallyol

lang/en_US.ini

@@ -262,3 +262,9 @@ Pass_Error="Password field is required"
 Token_Error="CSRF Token not correct"
 Captcha_Error="reCaptcha not correct"
 Invalid_Error="ERROR: Invalid username or password"
+;Profile
+Post_by_author="Posts by this author"
+Author_Description="Just another HTMLy user"
+;404-search
+Search_results_not_found="Search results not found!"
+No_search_results="No search results"

lang/ru_RU.ini

@@ -263,3 +263,9 @@ Pass_Error="Введите пароль"
 Token_Error="Неправильный токен"
 Captcha_Error="reCaptcha не верна"
 Invalid_Error="ОШИБКА: Неверные имя пользователя или Пароль"
+;Profile
+Post_by_author="Авторские статьи"
+Author_Description="Еще один пользователь HTMLy"
+;404-search
+Search_results_not_found="По вашему запросу ничего не найдено!"
+No_search_results="Безрезультатно"

system/admin/views/edit-page.html.php

@@ -26,7 +26,7 @@ if ($type == 'is_frontpage') {
 		$oldcontent = remove_html_comments($content);
 	} else {
 		$oldtitle = $user;
-		$oldcontent = 'Just another HTMLy user.';
+		$oldcontent = i18n('Author_Description');
 	}
 
 } else {
@@ -162,4 +162,4 @@ if ($type == 'is_frontpage') {
 </div>
 <!-- Declare the base path. Important -->
 <script type="text/javascript">var base_path = '<?php echo site_url() ?>';</script>
-<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/editor.js"></script>
+<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/editor.js"></script>

system/htmly.php

@@ -2149,10 +2149,10 @@ get('/search/:keyword', function ($keyword) {
     if (!$posts || $page < 1) {
         // a non-existing page or no search result
         render('404-search', array(
-            'title' => 'Search results not found! - ' . blog_title(),
-            'description' => 'Search results not found!',
+            'title' => i18n('Search_results_not_found') . ' - ' . blog_title(),
+            'description' => i18n('Search_results_not_found'),
             'search' => $tsearch,
-            'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; No search results',
+            'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . i18n('No_search_results'),
             'canonical' => site_url(),
             'bodyclass' => 'error-404-search',
             'is_404search' => true,

system/includes/functions.php

@@ -295,7 +295,7 @@ function get_posts($posts, $page = 1, $perpage = 0)
             $post->authorAbout = $profile[0]->about;
         } else {
             $post->authorName = $author;
-            $post->authorAbout = 'Just another HTMLy user';
+            $post->authorAbout = i18n('Author_Description');
         }
 
         $post->type = $type;
@@ -822,9 +822,9 @@ function default_profile($name)
     $author = new stdClass;
 
     $author->name = $name;
-    $author->about = '<p>Just another HTMLy user.</p>';
+    $author->about = '<p>' . i18n('Author_Description') . '</p>';
 
-    $author->description = 'Just another HTMLy user';
+    $author->description = i18n('Author_Description');
 
     return $tmp[] = $author;
 }
@@ -2304,7 +2304,7 @@ function not_found()
 
     header($_SERVER["SERVER_PROTOCOL"] . " 404 Not Found");
     render('404', array(
-        'title' => 'This page doesn\'t exist! - ' . blog_title(),
+        'title' => i18n('This_page_doesnt_exist') . ' - ' . blog_title(),
         'description' => '404 Not Found',
         'canonical' => site_url(),
         'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; 404 Not Found',