불가침, 종전 메시지

hwe/sammo/Command/Nation/che_불가침제의.php

@@ -105,8 +105,6 @@ class che_불가침제의 extends Command\NationCommand{
         $this->runnableConstraints=[
             ConstraintHelper::BeChief(),
             ConstraintHelper::NotBeNeutral(), 
-            ConstraintHelper::OccupiedCity(),
-            ConstraintHelper::SuppliedCity(),
             ConstraintHelper::ExistsDestNation(),
             ConstraintHelper::DisallowDiplomacyBetweenStatus([
                 0 => '아국과 이미 교전중입니다.',
@@ -137,7 +135,7 @@ class che_불가침제의 extends Command\NationCommand{
         $destNationName = getNationStaticInfo($this->arg['destNationID'])['name'];
         $year = $this->arg['year'];
         $month = $this->arg['month'];
-        return "【{$destNationName}】에게 {$year}년 {$month}월 전까지 {$commandName}";
+        return "【{$destNationName}】에게 {$year}년 {$month}월까지 {$commandName}";
     }
 
 
@@ -191,11 +189,13 @@ class che_불가침제의 extends Command\NationCommand{
         $validMinutes = max(30, $env['turnterm']*3);
         $validUntil->add(new \DateInterval("PT{$validMinutes}M"));
 
+        $josaWa = JosaUtil::pick($nationName, '와');
+
         $msg = new DiplomaticMessage(
             Message::MSGTYPE_DIPLOMACY,
             $src,
             $dest,
-            "{$nationName}와 {$year}년 {$month}월 전까지 불가침 제의 서신",
+            "{$nationName}{$josaWa} {$year}년 {$month}월까지 불가침 제의 서신",
             $now,
             $validUntil,
             [
@@ -283,7 +283,7 @@ class che_불가침제의 extends Command\NationCommand{
 <?php foreach(Util::range(1, 12+1) as $formMonth): ?>
     <option value='<?=$formMonth?>'><?=$formMonth?></option>
 <?php endforeach; ?>
-</select>월 전까지 
+</select>월까지 
 <input type=button id="commonSubmit" value="<?=$this->getName()?>">
 <?php
         return ob_get_clean();