Skip to content

Commit 44f3bfc

Browse files
authored
LT-9222: "***" appearing between inflectional features and values (#318)
* LT-9222: Make default separator be ":" * LT-9222: Add GetSeparator * LT-9222: Fix bug in GetSeparator * Remove spuriously added brackets
1 parent 4831cc7 commit 44f3bfc

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

src/SIL.LCModel/DomainImpl/OverridesCellar.cs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2299,17 +2299,22 @@ private string GetFeatureString(bool fLongForm)
22992299
sFeature = FeatureRA.Abbreviation.BestAnalysisAlternative.Text;
23002300
if (sFeature == null || sFeature.Length == 0)
23012301
sFeature = FeatureRA.Name.BestAnalysisAlternative.Text;
2302-
if (fLongForm)
2303-
sFeature = sFeature + ":";
2304-
else
2305-
sFeature = sFeature + FeatureRA.RightGlossSep.BestAnalysisAlternative.Text;
2302+
sFeature = sFeature + GetSeparator(FeatureRA, fLongForm);
23062303
}
23072304
}
23082305
else
23092306
sFeature = m_ksUnknown;
23102307
return sFeature;
23112308
}
23122309

2310+
internal static string GetSeparator(IFsFeatDefn feature, bool longForm)
2311+
{
2312+
string sep = feature.RightGlossSep.BestAnalysisAlternative.Text;
2313+
if (longForm || sep == "***")
2314+
return ":";
2315+
return sep;
2316+
}
2317+
23132318
/// <summary>
23142319
/// Overridden to handle reference props of this class.
23152320
/// </summary>
@@ -2526,7 +2531,7 @@ private string GetFeatureString(bool fLongForm)
25262531
sFeature = FeatureRA.Abbreviation.BestAnalysisAlternative.Text;
25272532
if (string.IsNullOrEmpty(sFeature))
25282533
sFeature = FeatureRA.Name.BestAnalysisAlternative.Text;
2529-
sFeature = fLongForm ? sFeature + ":" : sFeature + FeatureRA.RightGlossSep.BestAnalysisAlternative.Text;
2534+
sFeature = sFeature + FsClosedValue.GetSeparator(FeatureRA, fLongForm);
25302535
}
25312536
}
25322537
else

0 commit comments

Comments
 (0)