Commit 94349dd2 authored by 神楽坂玲奈's avatar 神楽坂玲奈

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/app-detail.component.html
parents 982f64a0 0fccdf96
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<a i18n href="https://mycard.moe/ygopro/arena/" target="_blank" class="moreinfo">更多资料</a> <a i18n href="https://mycard.moe/ygopro/arena/" target="_blank" class="moreinfo">更多资料</a>
</div> </div>
<div class="d-flex"> <div *ngIf="currentApp.description" class="d-flex">
<div class="panel" id="game_info"> <div class="panel" id="game_info">
<p [innerHTML]="currentApp.description"></p> <p [innerHTML]="currentApp.description"></p>
<div id="tags" *ngIf="currentApp.tags"> <div id="tags" *ngIf="currentApp.tags">
...@@ -114,7 +114,11 @@ ...@@ -114,7 +114,11 @@
<div class="panel" id="game_info_2"> <div class="panel" id="game_info_2">
<dl> <dl>
<dt>开发</dt> <dt>开发</dt>
<dd><a href="https://github.com/Fluorohydride/ygopro">Fluorohydride</a></dd> <dd *ngFor="let developer of currentApp.developers">
<a *ngIf="developer.url" target="_blank" href="{{developer.url}}">{{developer.name}}</a>
<span *ngIf="!developer.url" >{{developer.name}}</span>
</dd>
<dt>发行日期</dt> <dt>发行日期</dt>
<dd>{{currentApp.released_at | date:'mediumDate'}}</dd> <dd>{{currentApp.released_at | date:'mediumDate'}}</dd>
</dl> </dl>
......
...@@ -50,13 +50,13 @@ export class AppDetailComponent implements OnInit, OnChanges { ...@@ -50,13 +50,13 @@ export class AppDetailComponent implements OnInit, OnChanges {
'recommend': '推荐', 'recommend': '推荐',
'mysterious': '迷之物体', 'mysterious': '迷之物体',
'touhou': '东方 Project', 'touhou': '东方 Project',
'touhou-pc98': '东方旧作', 'touhou_pc98': '东方旧作',
'language': '语言包' 'language': '语言包'
} : { } : {
'recommend': 'Recommended', 'recommend': 'Recommended',
'mysterious': 'Something', 'mysterious': 'Something',
'touhou': 'Touhou Project', 'touhou': 'Touhou Project',
'touhou-pc98': 'Touhou old series', 'touhou_pc98': 'Touhou old series',
'language': 'Language Pack' 'language': 'Language Pack'
}; };
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment