Merge pull request #2244 from JasonBarnabe/categoryl10n

Translatable category names
vanilla · Jan 16, 2015 · f476a47 · f476a47
2 parents 600fcf7 + 894fbb9
commit f476a47
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/applications/vanilla/models/class.categorymodel.php b/applications/vanilla/models/class.categorymodel.php
@@ -676,6 +676,13 @@ public static function JoinUserData(&$Categories, $AddUserCategory = TRUE) {
          $Categories[$CID]['PermsDiscussionsEdit'] = $Session->CheckPermission('Vanilla.Discussions.Edit', TRUE, 'Category', $Category['PermissionCategoryID']);
          $Categories[$CID]['PermsCommentsAdd'] = $Session->CheckPermission('Vanilla.Comments.Add', TRUE, 'Category', $Category['PermissionCategoryID']);
       }
+
+      // Translate name and description
+      foreach ($IDs as $ID) {
+         $Code = $Categories[$ID]['UrlCode'];
+         $Categories[$ID]['Name'] = TranslateContent("Categories.".$Code.".Name", $Categories[$ID]['Name']);
+         $Categories[$ID]['Description'] = TranslateContent("Categories.".$Code.".Description", $Categories[$ID]['Description']);
+      }
    }
 
    /**

diff --git a/library/core/functions.general.php b/library/core/functions.general.php
@@ -3270,6 +3270,22 @@ function T($Code, $Default = FALSE) {
    }
 }
 
+if (!function_exists('TranslateContent')) {
+   /**
+	 * Translates user-generated content into the selected locale's definition. Currently just an
+	 * alias for T().
+	 *
+	 * @param string $Code The code related to the language-specific definition.
+    *   Codes thst begin with an '@' symbol are treated as literals and not translated.
+	 * @param string $Default The default value to be displayed if the translation code is not found.
+	 * @return string The translated string or $Code if there is no value in $Default.
+	 * @see Gdn::Translate()
+	 */
+   function TranslateContent($Code, $Default = FALSE) {
+      return T($Code, $Default);
+   }
+}
+
 if (!function_exists('Theme')) {
    function Theme() {
       return Gdn::ThemeManager()->CurrentTheme();