From aefb59ef98522ef8a10ab64b25840f11e622e1c7 Mon Sep 17 00:00:00 2001
From: Stardrad Yin <yin8086@gmail.com>
Date: Wed, 23 Jan 2013 03:16:08 -0500
Subject: [PATCH] Modify Chinese translation in properties file, and add new translation that synchronizes with commit synchronize with commit e4e6829

---
 src/com/gitblit/models/ServerSettings.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/com/gitblit/models/ServerSettings.java b/src/com/gitblit/models/ServerSettings.java
index 3658096..27199b4 100644
--- a/src/com/gitblit/models/ServerSettings.java
+++ b/src/com/gitblit/models/ServerSettings.java
@@ -54,10 +54,16 @@
 	}
 
 	public void add(SettingModel setting) {
-		settings.put(setting.name, setting);
+		if (setting != null) {
+			settings.put(setting.name, setting);
+		}
 	}
 
 	public SettingModel get(String key) {
 		return settings.get(key);
 	}
+	
+	public boolean hasKey(String key) {
+		return settings.containsKey(key);
+	}
 }

--
Gitblit v1.9.1