Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
2 parents a49a228 + f45aad4 commit 03711774c2001d69518d5c141c12a67f914c3f24 @anti43 committed Dec 30, 2012
Showing with 3 additions and 0 deletions.
  1. +3 −0 src/mpv5/handler/VariablesHandler.java
@@ -60,6 +60,7 @@
CREATE_USER("[CREATE_USER]"),
CURRENT_USER("[CURRENT_USER]"),
DATENUMERIC("[DATENUMERIC]"),
+ YEAR_SHORT("[YEAR_SHORT]"),
DAY("[DAY]");
private String val;
@@ -131,6 +132,8 @@ public String toString() {
varValue = String.valueOf(DateConverter.getQuarter());
} else if (varName.equals(GENERIC_VARS.YEAR.toString())) {
varValue = DateConverter.getYear();
+ } else if (varName.equals(GENERIC_VARS.YEAR_SHORT.toString())) {
+ varValue = String.valueOf(DateConverter.getYear()).substring(2);
} else if (varName.equals(GENERIC_VARS.OBJECT_MONTH.toString())) {
varValue = DateConverter.getMonthName(target.__getDateadded());
} else if (varName.equals(GENERIC_VARS.OBJECT_YEAR.toString())) {

0 comments on commit 0371177

Please sign in to comment.