[lmi-commits] [lmi] master 199c7b1: Distinguish "tobacco" and "nontobacco" correctly

[Greg Chicares]

branch: master
commit 199c7b11e77854c6eca9f1c0cd2dbe4d4bbbea40
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Distinguish "tobacco" and "nontobacco" correctly
---
 finra_notes2.mst              | 8 ++++----
 reg_d_group_narr_summary2.mst | 8 ++++----
 skin.xrc                      | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/finra_notes2.mst b/finra_notes2.mst
index 61ee13a..8db8b89 100644
--- a/finra_notes2.mst
+++ b/finra_notes2.mst
@@ -124,12 +124,12 @@ age {{EndtAge}}.
     in future years. Custom blending is available only on plans
     of 100 or more lives. Custom blend assumptions:
     {{#SmokerBlended}}
-        tobacco = {{SmokerPct}};
+        nontobacco = {{NonsmokerProportion}};
     {{/SmokerBlended}}
     {{^SmokerBlended}}
         no blending by tobacco use;
     {{/SmokerBlended}}
-    male = {{MalePct}}.
+    male = {{MaleProportion}}.
     </p>
 {{/GenderBlended}}
 {{#SmokerBlended}}
@@ -140,9 +140,9 @@ age {{EndtAge}}.
     assumes that the distribution remains constant
     in future years. Custom blending is available only on plans
     of 100 or more lives. Custom blend assumptions:
-    tobacco = {{SmokerPct}};
+    nontobacco = {{NonsmokerProportion}};
     {{#GenderBlended}}
-        male = {{MalePct}}.
+        male = {{MaleProportion}}.
     {{/GenderBlended}}
     {{^GenderBlended}}
         no blending by gender.
diff --git a/reg_d_group_narr_summary2.mst b/reg_d_group_narr_summary2.mst
index 4d20f55..7981607 100644
--- a/reg_d_group_narr_summary2.mst
+++ b/reg_d_group_narr_summary2.mst
@@ -85,12 +85,12 @@ or sending money.
     {{MortalityBlendFootnote}}
     Custom blend assumptions:
     {{#SmokerBlended}}
-        tobacco = {{SmokerPct}};
+        nontobacco = {{NonsmokerProportion}};
     {{/SmokerBlended}}
     {{^SmokerBlended}}
         no blending by tobacco use;
     {{/SmokerBlended}}
-    male = {{MalePct}}.
+    male = {{MaleProportion}}.
     </p>
 {{/GenderBlended}}
 {{^GenderBlended}}
@@ -98,9 +98,9 @@ or sending money.
         <p>
         {{MortalityBlendFootnote}}
         Custom blend assumptions:
-        tobacco = {{SmokerPct}};
+        nontobacco = {{NonsmokerProportion}};
         {{#GenderBlended}}
-            male = {{MalePct}}.
+            male = {{MaleProportion}}.
         {{/GenderBlended}}
         {{^GenderBlended}}
             no blending by gender.
diff --git a/skin.xrc b/skin.xrc
index 25627af..e27771e 100644
--- a/skin.xrc
+++ b/skin.xrc
@@ -366,7 +366,7 @@
                                             <border>4</border>
                                             <object class="wxCheckBox" 
name="BlendSmoking">
                                                 <help>Blend mortality by 
smoking</help>
-                                                <label>Tobacco</label>
+                                                <label>Nontobacco</label>
                                             </object>
                                         </object>
                                         <object class="sizeritem">