Merge pull request #710 from balibali/t-4671

(refs #4671, BP from #4668) SNS内名称設定で設定されている項目が翻訳されない場合がある
openpne · Jun 12, 2024 · 5f7458f · 5f7458f
2 parents 20302d1 + 0204f75
commit 5f7458f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/lib/config/opApplicationConfiguration.class.php b/lib/config/opApplicationConfiguration.class.php
@@ -215,10 +215,6 @@ public function filterTemplateParameters(sfEvent $event, $parameters)
 
     $table = Doctrine::getTable('SnsTerm');
     $application = sfConfig::get('sf_app');
-    if (in_array($application, array('pc_backend', 'api'), true))
-    {
-        $application = 'pc_frontend';
-    }
     $table->configure(sfContext::getInstance()->getUser()->getCulture(), $application);
     $parameters['op_term'] = $table;
     sfOutputEscaper::markClassAsSafe('SnsTermTable');

diff --git a/lib/i18n/opI18N.class.php b/lib/i18n/opI18N.class.php
@@ -21,10 +21,6 @@ public function initialize(sfApplicationConfiguration $configuration, sfCache $c
     parent::initialize($configuration, $cache, $options);
 
     $application = sfConfig::get('sf_app');
-    if (in_array($application, array('pc_backend', 'api'), true))
-    {
-        $application = 'pc_frontend';
-    }
     $this->terms = Doctrine::getTable('SnsTerm');
     $this->terms->configure($this->culture, $application);
   }

diff --git a/lib/model/doctrine/SnsTermTable.class.php b/lib/model/doctrine/SnsTermTable.class.php
@@ -17,14 +17,21 @@ class SnsTermTable extends Doctrine_Table implements ArrayAccess
 
   public function configure($culture = '', $application = '')
   {
-    if ($culture)
+    if (in_array($application, array('pc_backend', 'api'), true))
+    {
+        $application = 'pc_frontend';
+    }
+
+    if ($culture && $culture !== $this->culture)
     {
       $this->culture = $culture;
+      $this->terms = null;
     }
 
-    if ($application)
+    if ($application && $application !== $this->application)
     {
       $this->application = $application;
+      $this->terms = null;
     }
   }