Skip to content

Commit

Permalink
correcting indentation and printing of stacktrace to be consistent wi…
Browse files Browse the repository at this point in the history 
…th the rest of the class #1736
  • Loading branch information
thecapdan committed Sep 23, 2016
1 parent 9cc842f commit eb4209e
Showing 1 changed file with 38 additions and 41 deletions.
79 changes: 38 additions & 41 deletions ...-check-i18n-plugin/src/main/java/org/bladerunnerjs/plugin/checki18n/CheckI18nCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@
import org.bladerunnerjs.api.logging.Logger;

public class CheckI18nCommand extends JSAPArgsParsingCommandPlugin {

public class Messages {
public static final String APP_CHECK_I18N_CONSOLE_MSG = "I18N tokens for the app '%s' available at '%s'";
public static final String APP_DOES_NOT_EXIST_EXCEPTION = "The app '%s' does not exist";
public static final String NO_LOCALE_FOR_APP = "The app specified does not contain a default locale";
}

private BRJS brjs;
private Logger logger;
private String locale;
Expand All @@ -72,7 +72,7 @@ public class Messages {
public String getCommandName() {
return "check-i18n";
}

@Override
protected void configureArgsParser(JSAP argsParser) throws JSAPException {
argsParser.registerParameter(new UnflaggedOption("app-name").setRequired(true).setHelp("the application to search for missing translations"));
Expand All @@ -88,49 +88,49 @@ public String getCommandDescription() {
protected int doCommand(JSAPResult parsedArgs) throws CommandArgumentsException, CommandOperationException {
String appName = parsedArgs.getString("app-name");
locale = parsedArgs.getString("locale");

listMissingTokens(appName);
generateAllTranslationsCSV(appName);
return missingTokensExist ? -1 : 0;
}

private void listMissingTokens(String appName) throws CommandArgumentsException {
App app = brjs.app(appName);

try {
appLocales = app.appConf().getLocales();
} catch (ConfigException e) {
e.printStackTrace();
}

if(!app.dirExists())
throw new CommandArgumentsException( String.format(Messages.APP_DOES_NOT_EXIST_EXCEPTION, appName), this );

findMissingTranslationsForAppWithLocale(app);

for (Entry<String, Set<String>> tokensList : missingTokensMap.entrySet()) {
logMissingLocalesToConsole(appName, tokensList.getKey(), tokensList);
logMissingLocalesToConsole(appName, tokensList.getKey(), tokensList);
}
}

private void generateAllTranslationsCSV(String appName) {
logger.println("\ngenerating CSV\n");

TreeSet<String> localeNames = new TreeSet<String>();
for(Locale locale : appLocales ){
localeNames.add(locale.getLanguageCode());
}

List<String> headings = new ArrayList<String>();
headings.add("Token");
for(String localeName : localeNames){
headings.add(localeName);
}
headings.add("IsUsed");

List<List<String>> rows = new ArrayList<List<String>>();
rows.add(headings);

for(Entry<String, HashMap<String, String>> translationMap : allExistingTokens.entrySet()){
List<String> newEntry = new ArrayList<String>();
newEntry.add(translationMap.getKey());
Expand All @@ -142,10 +142,10 @@ private void generateAllTranslationsCSV(String appName) {
newEntry.add(translationMap.getValue().get("used"));
rows.add(newEntry);
}

File file = brjs.storageFile(this.getClass().getSimpleName(), appName + "-tokens.csv" );
file.getParentFile().mkdirs();

try{
Writer writer = new BufferedWriter(new OutputStreamWriter(
new FileOutputStream(file), "UTF-8"));
Expand All @@ -159,23 +159,20 @@ private void generateAllTranslationsCSV(String appName) {
writer.close();

String content = FileUtils.readFileToString(file, "UTF-8");
FileUtils.write(file, content, "UTF-8");
}
catch (UnsupportedEncodingException e)
{
System.out.println(e.getMessage());
}
catch (IOException e)
{
System.out.println(e.getMessage());
}
catch (Exception e)
{
System.out.println(e.getMessage());
}
logger.println(Messages.APP_CHECK_I18N_CONSOLE_MSG, appName, file.getAbsolutePath());
FileUtils.write(file, content, "UTF-8");
}

catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
catch (IOException e){
e.printStackTrace();
}
catch (Exception e) {
e.printStackTrace();
}
logger.println(Messages.APP_CHECK_I18N_CONSOLE_MSG, appName, file.getAbsolutePath());
}

private void logMissingLocalesToConsole(String appName, String localeToBeChecked, Entry<String, Set<String>> tokensList) {
String missingTokensMessage = tokensList.getValue().size() == 0 ? " has no missing translations" : " has no translations defined for the following tokens:";
String firstLogLine = "\n" + "For the locale " + tokensList.getKey() + ", " + appName + missingTokensMessage + "\n";
Expand All @@ -189,7 +186,7 @@ private void findMissingTranslationsForAppWithLocale(App app) {
for(Aspect aspect : app.aspects()) {
logger.println("checking " + aspect.getName() + " aspect");
checkMissingLocalsForBundlableNode(aspect);

checkMissingLocales(aspect);
}
for(Bladeset bladeset : app.bladesets()) {
Expand Down Expand Up @@ -236,7 +233,7 @@ private void checkBundletForMissingTokens(BundleSet bundleSet) {
}
checkAssetForMissingTokens(bundleSet, content, I18N_HTML_XML_TOKEN_PATTERN);
}

List<SourceModule> sourcceModules = bundleSet.sourceModules();
for(SourceModule sourceModule : sourcceModules){
String srcContent = null;
Expand Down Expand Up @@ -269,7 +266,7 @@ private void matchTokensForLocale(String content, Pattern pattern, Map<String, S
while (i18nTokenMatcher.find()) {
Boolean tokenIsNotComplete = false;
Boolean propertiesFileContainPartialMatch = false;

if(i18nTokenMatcher.groupCount() > 1){
tokenIsNotComplete = i18nTokenMatcher.group(2) != null && i18nTokenMatcher.group(2).indexOf('+') != -1;
propertiesFileContainPartialMatch = mapContainsPartialToken(propertiesMap, i18nTokenMatcher.group(1)) && tokenIsNotComplete;
Expand All @@ -292,7 +289,7 @@ else if (keyReplacement != null) {
else{
missingTokensMap.get(localeCode).addAll(missingTokens);
}

addUnusedTokensToAllTokensMap(propertiesMap, localeCode);
}

Expand All @@ -301,7 +298,7 @@ private void addUnusedTokensToAllTokensMap(Map<String, String> propertiesMap, St
{
String i18nKey = i18nPair.getKey();
String translation = i18nPair.getValue();

if(!allExistingTokens.containsKey(i18nKey)){
populateAllTokensMap(localeCode, i18nKey, translation, false);
}
Expand All @@ -320,10 +317,10 @@ private void populateAllTokensMap(String localeCode, String i18nKey, String keyR

private boolean mapContainsPartialToken(Map<String, String> propertiesMap, String partialToken) {
for(Entry<String, String> entry : propertiesMap.entrySet()) {
String i18nToken = entry.getKey();
if(i18nToken.contains(partialToken))
return true;
}
String i18nToken = entry.getKey();
if(i18nToken.contains(partialToken))
return true;
}
return false;
}

Expand Down

0 comments on commit eb4209e

Please sign in to comment.