diff --git a/dsite/settings_default.py b/dsite/settings_default.py
index de5f3fa..3232664 100644
--- a/dsite/settings_default.py
+++ b/dsite/settings_default.py
@@ -111,9 +111,8 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/1.11/topics/i18n/
 
-LANGUAGE_CODE = 'en-us'
-
-TIME_ZONE = 'UTC'
+TIME_ZONE = 'Asia/Shanghai'
+LANGUAGE_CODE = 'zh-hans'
 
 USE_I18N = True
 
diff --git a/timer/templates/index.html b/timer/templates/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/timer/views.py b/timer/views.py
index 347e797..4ee7146 100644
--- a/timer/views.py
+++ b/timer/views.py
@@ -61,7 +61,7 @@ class OfficeHoursAPI(CreateAPIView):
 
     resp_data = {
       'begins_at': begins_at.strftime('%Y-%m-%d %H:%M'),
-      'ends_at': ends_at.strftime('%Y-%m-%d %H:%M'),
+      'ends_at': ends_at.strftime('%H:%M'),
     }
 
     return Response(resp_data, status=status.HTTP_201_CREATED)