mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-18 22:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.3.0-rc8' into develop

Browse Source
This commit is contained in:
Sebastian Stenzel
2017-06-28 11:39:11 +02:00
parent 4e5edc834f 096e063754
commit 6dc597f826
6 changed files with 23 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/ui/pom.xml
-4
View File
@@ -62,10 +62,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
main/ui/src/main/java/org/cryptomator/ui/l10n/Localization.java
+3 -2
View File
@@ -22,11 +22,12 @@ import java.util.ResourceBundle;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Sets;
@Singleton
public class Localization extends ResourceBundle {
@@ -88,7 +89,7 @@ public class Localization extends ResourceBundle {
@Override
public Enumeration<String> getKeys() {
Collection<String> keys = CollectionUtils.union(localized.keySet(), fallback.keySet());
Collection<String> keys = Sets.union(localized.keySet(), fallback.keySet());
return Collections.enumeration(keys);
}