From 6b76d4fb30104f08a7c6b33d7cf05fb71179f6de Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 04 Sep 2014 14:20:28 -0400
Subject: [PATCH] Merge branch 'ticket/151' into develop
---
src/main/java/com/gitblit/manager/IRuntimeManager.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/IRuntimeManager.java b/src/main/java/com/gitblit/manager/IRuntimeManager.java
index acd3a57..8322d34 100644
--- a/src/main/java/com/gitblit/manager/IRuntimeManager.java
+++ b/src/main/java/com/gitblit/manager/IRuntimeManager.java
@@ -17,14 +17,18 @@
import java.io.File;
import java.util.Date;
+import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
import com.gitblit.IStoredSettings;
import com.gitblit.models.ServerSettings;
import com.gitblit.models.ServerStatus;
+import com.google.inject.Injector;
public interface IRuntimeManager extends IManager {
+
+ Injector getInjector();
void setBaseFolder(File folder);
@@ -39,13 +43,12 @@
TimeZone getTimezone();
/**
- * Determine if this Gitblit instance is actively serving git repositories
- * or if it is merely a repository viewer.
+ * Returns the fixed locale for clients, or null if clients may choose their locale
*
- * @return true if Gitblit is serving repositories
- * @since 1.4.0
+ * @return a fixed locale or null if clients are allowed to specify locale preference
+ * @since 1.5.1
*/
- boolean isServingRepositories();
+ Locale getLocale();
/**
* Determine if this Gitblit instance is running in debug mode
--
Gitblit v1.9.1