Move newly added common text to a better location. (#993)

Ref #989 #992
crankyoldgit · Nov 14, 2019 · fd6b88d · fd6b88d
1 parent bbf3738
commit fd6b88d
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 14 deletions.
diff --git a/src/IRtext.cpp b/src/IRtext.cpp
@@ -125,13 +125,24 @@ const PROGMEM char* kCentreStr = D_STR_CENTRE;
 const PROGMEM char* kTopStr = D_STR_TOP;
 const PROGMEM char* kBottomStr = D_STR_BOTTOM;
 
+// Compound words/phrases/descriptions from pre-defined words.
+const PROGMEM char* kEyeAutoStr = D_STR_EYEAUTO;
+const PROGMEM char* kLightToggleStr = D_STR_LIGHTTOGGLE;
+const PROGMEM char* kOutsideQuietStr = D_STR_OUTSIDEQUIET;
+const PROGMEM char* kPowerToggleStr = D_STR_POWERTOGGLE;
+const PROGMEM char* kSensorTempStr = D_STR_SENSORTEMP;
+const PROGMEM char* kSleepTimerStr = D_STR_SLEEP_TIMER;
+const PROGMEM char* kSwingVModeStr = D_STR_SWINGVMODE;
+const PROGMEM char* kSwingVToggleStr = D_STR_SWINGVTOGGLE;
+
+// Separators
+char kTimeSep = D_CHR_TIME_SEP;
 const PROGMEM char* kSpaceLBraceStr = D_STR_SPACELBRACE;
 const PROGMEM char* kCommaSpaceStr = D_STR_COMMASPACE;
 const PROGMEM char* kColonSpaceStr = D_STR_COLONSPACE;
 
 // IRutils
 //  - Time
-char kTimeSep = D_CHR_TIME_SEP;
 const PROGMEM char* kDayStr = D_STR_DAY;
 const PROGMEM char* kDaysStr = D_STR_DAYS;
 const PROGMEM char* kHourStr = D_STR_HOUR;
@@ -151,13 +162,3 @@ const PROGMEM char* kFalseStr = D_STR_FALSE;
 const PROGMEM char* kRepeatStr = D_STR_REPEAT;
 const PROGMEM char* kCodeStr = D_STR_CODE;
 const PROGMEM char* kBitsStr = D_STR_BITS;
-
-// Misc
-const PROGMEM char* kEyeAutoStr = D_STR_EYE " " D_STR_AUTO;
-const PROGMEM char* kLightToggleStr = D_STR_LIGHT " " D_STR_TOGGLE;
-const PROGMEM char* kOutsideQuietStr = D_STR_OUTSIDE " " D_STR_QUIET;
-const PROGMEM char* kPowerToggleStr = D_STR_POWER " " D_STR_TOGGLE;
-const PROGMEM char* kSensorTempStr = D_STR_SENSOR " " D_STR_TEMP;
-const PROGMEM char* kSleepTimerStr = D_STR_SLEEP " " D_STR_TIMER;
-const PROGMEM char* kSwingVModeStr = D_STR_SWINGV " " D_STR_MODE;
-const PROGMEM char* kSwingVToggleStr = D_STR_SWINGV " " D_STR_TOGGLE;
diff --git a/src/locale/defaults.h b/src/locale/defaults.h
@@ -349,6 +349,37 @@
 #define D_STR_BOTTOM "Bottom"
 #endif  // D_STR_BOTTOM
 
+// Compound words/phrases/descriptions from pre-defined words.
+// Note: Obviously these need to be defined *after* their component words.
+#ifndef D_STR_EYEAUTO
+#define D_STR_EYEAUTO D_STR_EYE " " D_STR_AUTO
+#endif  // D_STR_EYEAUTO
+#ifndef D_STR_LIGHTTOGGLE
+#define D_STR_LIGHTTOGGLE D_STR_LIGHT " " D_STR_TOGGLE
+#endif  // D_STR_LIGHTTOGGLE
+#ifndef D_STR_OUTSIDEQUIET
+#define D_STR_OUTSIDEQUIET D_STR_OUTSIDE " " D_STR_QUIET
+#endif  // D_STR_OUTSIDEQUIET
+#ifndef D_STR_POWERTOGGLE
+#define D_STR_POWERTOGGLE D_STR_POWER " " D_STR_TOGGLE
+#endif  // D_STR_POWERTOGGLE
+#ifndef D_STR_SENSORTEMP
+#define D_STR_SENSORTEMP D_STR_SENSOR " " D_STR_TEMP
+#endif  // D_STR_SENSORTEMP
+#ifndef D_STR_SLEEP_TIMER
+#define D_STR_SLEEP_TIMER D_STR_SLEEP " " D_STR_TIMER
+#endif  // D_STR_SLEEP_TIMER
+#ifndef D_STR_SWINGVMODE
+#define D_STR_SWINGVMODE D_STR_SWINGV " " D_STR_MODE
+#endif  // D_STR_SWINGVMODE
+#ifndef D_STR_SWINGVTOGGLE
+#define D_STR_SWINGVTOGGLE D_STR_SWINGV " " D_STR_TOGGLE
+#endif  // D_STR_SWINGVTOGGLE
+
+// Separators
+#ifndef D_CHR_TIME_SEP
+#define D_CHR_TIME_SEP ':'
+#endif  // D_CHR_TIME_SEP
 #ifndef D_STR_SPACELBRACE
 #define D_STR_SPACELBRACE " ("
 #endif  // D_STR_SPACELBRACE
@@ -359,9 +390,6 @@
 #define D_STR_COLONSPACE ": "
 #endif  // D_STR_COLONSPACE
 
-#ifndef D_CHR_TIME_SEP
-#define D_CHR_TIME_SEP ':'
-#endif  // D_CHR_TIME_SEP
 #ifndef D_STR_DAY
 #define D_STR_DAY "Day"
 #endif  // D_STR_DAY