Merge branch '1.x-1.x' of github.com:backdrop-contrib/on_the_web into…

… 1.x-1.x
backdrop-contrib · Aug 28, 2021 · 9a60285 · 9a60285
2 parents fe3994a + 69b6cfb
commit 9a60285
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/on_the_web.module b/on_the_web.module
@@ -178,7 +178,16 @@ function on_the_web_display_block($delta, $settings = array(), $contexts = array
         $title = t('Find !us on !service', array('!us' => $name, '!service' => $info['name']));
       }
       else {
-        $title = t('!us RSS feed', array('!us' => $name));
+        if ($config->get('sitename') == 1) {
+          $rss_name = $name;
+        }
+        elseif ($config->get('sitename') == 0) {
+          $rss_name = t('Our');
+        }
+        elseif ($config->get('sitename') == 2) {
+          $rss_name = t('My');
+        }
+        $title = t('!us RSS feed', array('!us' => $rss_name));
       }
 
       $size = $config->get('size');

diff --git a/on_the_web.theme.inc b/on_the_web.theme.inc
@@ -43,7 +43,12 @@ function theme_on_the_web_item($variables) {
   // Add the font awesome icon classes with support for v5.
   $icon_classes = array($icon, 'fa-fw');
   if (module_exists('font_awesome') && config_get('font_awesome.settings', 'fontawesome') == 'v5') {
-    $icon_classes[] = 'fab';
+    if ($service == 'rss') {
+      $icon_classes[] = 'fas';
+    }
+    else {
+      $icon_classes[] = 'fab';
+    }
   }
   else {
     $icon_classes[] = 'fa';