diff --git a/module/extension/lang/de.php b/module/extension/lang/de.php
index a30e94b6fc..f692487ef2 100644
--- a/module/extension/lang/de.php
+++ b/module/extension/lang/de.php
@@ -9,51 +9,52 @@
  * @version     $Id$
  * @link        http://www.zentao.net
  */
-$lang->extension->common        = 'Erweiterung';
-$lang->extension->browse        = 'Durchsuchen';
-$lang->extension->install       = 'Installieren';
-$lang->extension->installAuto   = 'Auto Install';
-$lang->extension->installForce  = 'Installation erzwingen';
-$lang->extension->uninstall     = 'Deinstallieren';
+$lang->extension->common           = 'Erweiterung';
+$lang->extension->browse           = 'Durchsuchen';
+$lang->extension->install          = 'Installieren';
+$lang->extension->installAuto      = 'Auto Install';
+$lang->extension->installForce     = 'Installation erzwingen';
+$lang->extension->uninstall        = 'Deinstallieren';
 $lang->extension->uninstallAction  = 'Uninstall Extension';
-$lang->extension->activate      = 'Aktivieren';
+$lang->extension->activate         = 'Aktivieren';
 $lang->extension->activateAction   = 'Activate Extension';
-$lang->extension->deactivate    = 'Deaktivieren';
+$lang->extension->deactivate       = 'Deaktivieren';
 $lang->extension->deactivateAction = 'Deactivate Extension';
-$lang->extension->obtain        = 'Hole Erweiterung';
-$lang->extension->view          = 'Details';
-$lang->extension->downloadAB    = 'Download';
-$lang->extension->upload        = 'Local Installation';
-$lang->extension->erase         = 'Löschen';
+$lang->extension->obtain           = 'Hole Erweiterung';
+$lang->extension->view             = 'Details';
+$lang->extension->downloadAB       = 'Download';
+$lang->extension->upload           = 'Local Installation';
+$lang->extension->erase            = 'Löschen';
 $lang->extension->eraseAction      = 'Erase Extension';
-$lang->extension->upgrade       = 'Erweiterung Upgraden';
-$lang->extension->agreeLicense  = 'Lizenz';
+$lang->extension->upgrade          = 'Erweiterung Upgraden';
+$lang->extension->agreeLicense     = 'Lizenz';
 
 $lang->extension->structure       = 'Struktur';
 $lang->extension->structureAction = 'Struktur';
 $lang->extension->installed       = 'Installiert';
-$lang->extension->deactivated   = 'Deaktiviert';
-$lang->extension->available     = 'Heruntergeladen';
+$lang->extension->deactivated     = 'Deaktiviert';
+$lang->extension->available       = 'Heruntergeladen';
 
-$lang->extension->name        = 'Erweiterungsname';
-$lang->extension->code        = 'Code';
-$lang->extension->desc        = 'Beschreiben';
-$lang->extension->type        = 'Typ';
-$lang->extension->dirs        = 'Verzeichnisse';
-$lang->extension->files       = 'Dateien';
-$lang->extension->status      = 'Status';
-$lang->extension->version     = 'Version';
-$lang->extension->latest      = '<small>Letzte:<strong><a href="%s" target="_blank" class="extension">%s</a></strong>，benötigt ZenTao <a href="http://api.zentao.net/goto.php?item=latest" target="_blank"><strong>%s</strong></small>';
-$lang->extension->author      = 'Author';
-$lang->extension->license     = 'Lizenz';
-$lang->extension->site        = 'Website';
-$lang->extension->downloads   = 'Downloads';
-$lang->extension->compatible  = 'Kompatibilität';
-$lang->extension->grade       = 'Wertung';
-$lang->extension->depends     = 'Benötigt';
-$lang->extension->expireDate  = 'Verfällt';
-$lang->extension->zentaoCompatible  = 'Kompatible Version';
-$lang->extension->installedTime     = 'Installationszeit';
+$lang->extension->name             = 'Erweiterungsname';
+$lang->extension->code             = 'Code';
+$lang->extension->desc             = 'Beschreiben';
+$lang->extension->type             = 'Typ';
+$lang->extension->dirs             = 'Verzeichnisse';
+$lang->extension->files            = 'Dateien';
+$lang->extension->status           = 'Status';
+$lang->extension->version          = 'Version';
+$lang->extension->latest           = '<small>Letzte:<strong><a href="%s" target="_blank" class="extension">%s</a></strong>，benötigt ZenTao <a href="http://api.zentao.net/goto.php?item=latest" target="_blank"><strong>%s</strong></small>';
+$lang->extension->author           = 'Author';
+$lang->extension->license          = 'Lizenz';
+$lang->extension->site             = 'Website';
+$lang->extension->downloads        = 'Downloads';
+$lang->extension->compatible       = 'Kompatibilität';
+$lang->extension->grade            = 'Wertung';
+$lang->extension->depends          = 'Benötigt';
+$lang->extension->expireDate       = 'Verfällt';
+$lang->extension->zentaoCompatible = 'Kompatible Version';
+$lang->extension->installedTime    = 'Installationszeit';
+$lang->extension->life             = 'lifetime';
 
 $lang->extension->publicList[0] = 'Manuell';
 $lang->extension->publicList[1] = 'Auto';
diff --git a/module/extension/lang/en.php b/module/extension/lang/en.php
index 9f6d32a4da..b2c0feb24c 100644
--- a/module/extension/lang/en.php
+++ b/module/extension/lang/en.php
@@ -35,25 +35,26 @@ $lang->extension->installed        = 'Installed';
 $lang->extension->deactivated      = 'Deactivated';
 $lang->extension->available        = 'Downloaded';
 
-$lang->extension->name        = 'Extension Name';
-$lang->extension->code        = 'Code';
-$lang->extension->desc        = 'Description';
-$lang->extension->type        = 'Type';
-$lang->extension->dirs        = 'Installation Directory';
-$lang->extension->files       = 'Installation Files';
-$lang->extension->status      = 'Status';
-$lang->extension->version     = 'Version';
-$lang->extension->latest      = '<small>Latest:<strong><a href="%s" target="_blank" class="extension">%s</a></strong>，need zentao <a href="https://api.zentao.net/goto.php?item=latest" target="_blank"><strong>%s</strong></small>';
-$lang->extension->author      = 'Author';
-$lang->extension->license     = 'License';
-$lang->extension->site        = 'Website';
-$lang->extension->downloads   = 'Downloads';
-$lang->extension->compatible  = 'Compatibility';
-$lang->extension->grade       = 'Score';
-$lang->extension->depends     = 'Dependency';
-$lang->extension->expireDate  = 'Expire';
-$lang->extension->zentaoCompatible  = 'Compatible Version';
-$lang->extension->installedTime     = 'Installed Time';
+$lang->extension->name             = 'Extension Name';
+$lang->extension->code             = 'Code';
+$lang->extension->desc             = 'Description';
+$lang->extension->type             = 'Type';
+$lang->extension->dirs             = 'Installation Directory';
+$lang->extension->files            = 'Installation Files';
+$lang->extension->status           = 'Status';
+$lang->extension->version          = 'Version';
+$lang->extension->latest           = '<small>Latest:<strong><a href="%s" target="_blank" class="extension">%s</a></strong>，need zentao <a href="https://api.zentao.net/goto.php?item=latest" target="_blank"><strong>%s</strong></small>';
+$lang->extension->author           = 'Author';
+$lang->extension->license          = 'License';
+$lang->extension->site             = 'Website';
+$lang->extension->downloads        = 'Downloads';
+$lang->extension->compatible       = 'Compatibility';
+$lang->extension->grade            = 'Score';
+$lang->extension->depends          = 'Dependency';
+$lang->extension->expireDate       = 'Expire';
+$lang->extension->zentaoCompatible = 'Compatible Version';
+$lang->extension->installedTime    = 'Installed Time';
+$lang->extension->life             = 'lifetime';
 
 $lang->extension->publicList[0] = 'Manual';
 $lang->extension->publicList[1] = 'Auto';
diff --git a/module/extension/lang/fr.php b/module/extension/lang/fr.php
index 37f976d5ff..2ac2c48056 100644
--- a/module/extension/lang/fr.php
+++ b/module/extension/lang/fr.php
@@ -35,25 +35,26 @@ $lang->extension->installed        = 'Installée';
 $lang->extension->deactivated      = 'Désctivatée';
 $lang->extension->available        = 'Téléchargée';
 
-$lang->extension->name        = 'Nom Extension';
-$lang->extension->code        = 'Code';
-$lang->extension->desc        = 'Description';
-$lang->extension->type        = 'Type';
-$lang->extension->dirs        = 'Répertoire Installation';
-$lang->extension->files       = 'Fichiers Installation';
-$lang->extension->status      = 'Statut';
-$lang->extension->version     = 'Version';
-$lang->extension->latest      = '<small>Dernière:<strong><a href="%s" target="_blank" class="extension">%s</a></strong>，a besoin de zentao <a href="https://api.zentao.pm/goto.php?item=latest" target="_blank"><strong>%s</strong></small>';
-$lang->extension->author      = 'Auteur';
-$lang->extension->license     = 'License';
-$lang->extension->site        = 'Website';
-$lang->extension->downloads   = 'Téléchargements';
-$lang->extension->compatible  = 'Compatibilité';
-$lang->extension->grade       = 'Score';
-$lang->extension->depends     = 'Dépendence';
-$lang->extension->expireDate  = 'Expire le';
-$lang->extension->zentaoCompatible  = 'Version Compatible';
-$lang->extension->installedTime     = 'Date Installation';
+$lang->extension->name             = 'Nom Extension';
+$lang->extension->code             = 'Code';
+$lang->extension->desc             = 'Description';
+$lang->extension->type             = 'Type';
+$lang->extension->dirs             = 'Répertoire Installation';
+$lang->extension->files            = 'Fichiers Installation';
+$lang->extension->status           = 'Statut';
+$lang->extension->version          = 'Version';
+$lang->extension->latest           = '<small>Dernière:<strong><a href="%s" target="_blank" class="extension">%s</a></strong>，a besoin de zentao <a href="https://api.zentao.pm/goto.php?item=latest" target="_blank"><strong>%s</strong></small>';
+$lang->extension->author           = 'Auteur';
+$lang->extension->license          = 'License';
+$lang->extension->site             = 'Website';
+$lang->extension->downloads        = 'Téléchargements';
+$lang->extension->compatible       = 'Compatibilité';
+$lang->extension->grade            = 'Score';
+$lang->extension->depends          = 'Dépendence';
+$lang->extension->expireDate       = 'Expire le';
+$lang->extension->zentaoCompatible = 'Version Compatible';
+$lang->extension->installedTime    = 'Date Installation';
+$lang->extension->life             = 'lifetime';
 
 $lang->extension->publicList[0] = 'Manuel';
 $lang->extension->publicList[1] = 'Auto';
diff --git a/module/extension/lang/vi.php b/module/extension/lang/vi.php
index ad5aa839b3..01c7a938c4 100644
--- a/module/extension/lang/vi.php
+++ b/module/extension/lang/vi.php
@@ -54,6 +54,7 @@ $lang->extension->depends          = 'Dependency';
 $lang->extension->expireDate       = 'Expire';
 $lang->extension->zentaoCompatible = 'Compatible Version';
 $lang->extension->installedTime    = 'Installed Time';
+$lang->extension->life             = 'lifetime';
 
 $lang->extension->publicList[0] = 'Manual';
 $lang->extension->publicList[1] = 'Tự động';
diff --git a/module/extension/lang/zh-cn.php b/module/extension/lang/zh-cn.php
index b79c5e998b..a157584c4d 100644
--- a/module/extension/lang/zh-cn.php
+++ b/module/extension/lang/zh-cn.php
@@ -35,25 +35,26 @@ $lang->extension->installed       = '已安装';
 $lang->extension->deactivated     = '被禁用';
 $lang->extension->available       = '已下载';
 
-$lang->extension->name        = '插件名称';
-$lang->extension->code        = '代号';
-$lang->extension->desc        = '描述';
-$lang->extension->type        = '类型';
-$lang->extension->dirs        = '安装目录';
-$lang->extension->files       = '安装文件';
-$lang->extension->status      = '状态';
-$lang->extension->version     = '版本';
-$lang->extension->latest      = '<small>最新版本<strong><a href="%s" target="_blank" class="extension">%s</a></strong>，兼容禅道<a href="https://api.zentao.net/goto.php?item=latest" target="_blank" class="alert-link"><strong>%s</strong></a></small>';
-$lang->extension->author      = '作者';
-$lang->extension->license     = '授权';
-$lang->extension->site        = '官网';
-$lang->extension->downloads   = '下载量';
-$lang->extension->compatible  = '兼容性';
-$lang->extension->grade       = '评分';
-$lang->extension->depends     = '依赖';
-$lang->extension->expireDate  = '到期日期';
-$lang->extension->zentaoCompatible  = '适用版本';
-$lang->extension->installedTime     = '安装时间';
+$lang->extension->name             = '插件名称';
+$lang->extension->code             = '代号';
+$lang->extension->desc             = '描述';
+$lang->extension->type             = '类型';
+$lang->extension->dirs             = '安装目录';
+$lang->extension->files            = '安装文件';
+$lang->extension->status           = '状态';
+$lang->extension->version          = '版本';
+$lang->extension->latest           = '<small>最新版本<strong><a href="%s" target="_blank" class="extension">%s</a></strong>，兼容禅道<a href="https://api.zentao.net/goto.php?item=latest" target="_blank" class="alert-link"><strong>%s</strong></a></small>';
+$lang->extension->author           = '作者';
+$lang->extension->license          = '授权';
+$lang->extension->site             = '官网';
+$lang->extension->downloads        = '下载量';
+$lang->extension->compatible       = '兼容性';
+$lang->extension->grade            = '评分';
+$lang->extension->depends          = '依赖';
+$lang->extension->expireDate       = '到期日期';
+$lang->extension->zentaoCompatible = '适用版本';
+$lang->extension->installedTime    = '安装时间';
+$lang->extension->life             = '终身';
 
 $lang->extension->publicList[0] = '手工下载';
 $lang->extension->publicList[1] = '直接下载';
diff --git a/module/extension/lang/zh-tw.php b/module/extension/lang/zh-tw.php
index da20a0d768..9298092656 100644
--- a/module/extension/lang/zh-tw.php
+++ b/module/extension/lang/zh-tw.php
@@ -35,25 +35,26 @@ $lang->extension->installed       = '已安裝';
 $lang->extension->deactivated     = '被禁用';
 $lang->extension->available       = '已下載';
 
-$lang->extension->name        = '插件名稱';
-$lang->extension->code        = '代號';
-$lang->extension->desc        = '描述';
-$lang->extension->type        = '類型';
-$lang->extension->dirs        = '安裝目錄';
-$lang->extension->files       = '安裝檔案';
-$lang->extension->status      = '狀態';
-$lang->extension->version     = '版本';
-$lang->extension->latest      = '<small>最新版本<strong><a href="%s" target="_blank" class="extension">%s</a></strong>，兼容禪道<a href="https://api.zentao.net/goto.php?item=latest" target="_blank" class="alert-link"><strong>%s</strong></a></small>';
-$lang->extension->author      = '作者';
-$lang->extension->license     = '授權';
-$lang->extension->site        = '官網';
-$lang->extension->downloads   = '下載量';
-$lang->extension->compatible  = '兼容性';
-$lang->extension->grade       = '評分';
-$lang->extension->depends     = '依賴';
-$lang->extension->expireDate  = '到期日期';
-$lang->extension->zentaoCompatible  = '適用版本';
-$lang->extension->installedTime     = '安裝時間';
+$lang->extension->name             = '插件名稱';
+$lang->extension->code             = '代號';
+$lang->extension->desc             = '描述';
+$lang->extension->type             = '類型';
+$lang->extension->dirs             = '安裝目錄';
+$lang->extension->files            = '安裝檔案';
+$lang->extension->status           = '狀態';
+$lang->extension->version          = '版本';
+$lang->extension->latest           = '<small>最新版本<strong><a href="%s" target="_blank" class="extension">%s</a></strong>，兼容禪道<a href="https://api.zentao.net/goto.php?item=latest" target="_blank" class="alert-link"><strong>%s</strong></a></small>';
+$lang->extension->author           = '作者';
+$lang->extension->license          = '授權';
+$lang->extension->site             = '官網';
+$lang->extension->downloads        = '下載量';
+$lang->extension->compatible       = '兼容性';
+$lang->extension->grade            = '評分';
+$lang->extension->depends          = '依賴';
+$lang->extension->expireDate       = '到期日期';
+$lang->extension->zentaoCompatible = '適用版本';
+$lang->extension->installedTime    = '安裝時間';
+$lang->extension->life             = '終身';
 
 $lang->extension->publicList[0] = '手工下載';
 $lang->extension->publicList[1] = '直接下載';
diff --git a/module/extension/model.php b/module/extension/model.php
index d7d5085111..bf05963faf 100644
--- a/module/extension/model.php
+++ b/module/extension/model.php
@@ -910,6 +910,10 @@ class extensionModel extends model
                 $startDate  = $order->paidDate != '0000-00-00 00:00:00' ? $order->paidDate : $order->createdDate;
                 if($days) $expireDate = date('Y-m-d', strtotime($startDate) + $days * 24 * 3600);
             }
+            else
+            {
+                $expireDate = $order->type;
+            }
         }
 
         return $expireDate;
diff --git a/module/extension/view/browse.html.php b/module/extension/view/browse.html.php
index 556951cf65..59bed96653 100644
--- a/module/extension/view/browse.html.php
+++ b/module/extension/view/browse.html.php
@@ -55,7 +55,13 @@
         echo "{$lang->extension->version}:    <i>{$extension->version}</i> ";
         echo "{$lang->extension->author}:     <i>{$extension->author}</i> ";
         $expireDate = $this->extension->getExpireDate($extension);
-        if(!empty($expireDate)) echo "{$lang->extension->expireDate}:     <i>{$expireDate}</i>";
+
+        if(!empty($expireDate))
+        {
+            echo $lang->extension->expireDate . ': ';
+            if($expireDate != 'life') echo "<i>{$expireDate}</i>";
+            else echo "<i>{$lang->extension->life}</i>";
+        }
         ?>
       </div>
     </div>