@@ -52,221 +52,221 @@ |
||
52 | 52 | } |
53 | 53 | |
54 | 54 | switch ($type) { |
55 | - case 'attendant': |
|
56 | - switch ($sex) { |
|
57 | - case 'M': |
|
58 | - return I18N::translateContext('MALE', 'Attendant'); |
|
59 | - case 'F': |
|
60 | - return I18N::translateContext('FEMALE', 'Attendant'); |
|
61 | - default: |
|
62 | - return I18N::translate('Attendant'); |
|
63 | - } |
|
64 | - case 'attending': |
|
65 | - switch ($sex) { |
|
66 | - case 'M': |
|
67 | - return I18N::translateContext('MALE', 'Attending'); |
|
68 | - case 'F': |
|
69 | - return I18N::translateContext('FEMALE', 'Attending'); |
|
70 | - default: |
|
71 | - return I18N::translate('Attending'); |
|
72 | - } |
|
73 | - case 'best_man': |
|
74 | - // always male |
|
75 | - return I18N::translate('Best man'); |
|
76 | - case 'bridesmaid': |
|
77 | - // always female |
|
78 | - return I18N::translate('Bridesmaid'); |
|
79 | - case 'buyer': |
|
80 | - switch ($sex) { |
|
81 | - case 'M': |
|
82 | - return I18N::translateContext('MALE', 'Buyer'); |
|
83 | - case 'F': |
|
84 | - return I18N::translateContext('FEMALE', 'Buyer'); |
|
85 | - default: |
|
86 | - return I18N::translate('Buyer'); |
|
87 | - } |
|
88 | - case 'circumciser': |
|
89 | - // always male |
|
90 | - return I18N::translate('Circumciser'); |
|
91 | - case 'civil_registrar': |
|
92 | - switch ($sex) { |
|
93 | - case 'M': |
|
94 | - return I18N::translateContext('MALE', 'Civil registrar'); |
|
95 | - case 'F': |
|
96 | - return I18N::translateContext('FEMALE', 'Civil registrar'); |
|
97 | - default: |
|
98 | - return I18N::translate('Civil registrar'); |
|
99 | - } |
|
100 | - case 'employee': |
|
101 | - switch ($sex) { |
|
102 | - case 'M': |
|
103 | - return I18N::translateContext('MALE', 'Employee'); |
|
104 | - case 'F': |
|
105 | - return I18N::translateContext('FEMALE', 'Employee'); |
|
106 | - default: |
|
107 | - return I18N::translate('Employee'); |
|
108 | - } |
|
109 | - case 'employer': |
|
110 | - switch ($sex) { |
|
111 | - case 'M': |
|
112 | - return I18N::translateContext('MALE', 'Employer'); |
|
113 | - case 'F': |
|
114 | - return I18N::translateContext('FEMALE', 'Employer'); |
|
115 | - default: |
|
116 | - return I18N::translate('Employer'); |
|
117 | - } |
|
118 | - case 'foster_child': |
|
119 | - // no sex implied |
|
120 | - return I18N::translate('Foster child'); |
|
121 | - case 'foster_father': |
|
122 | - // always male |
|
123 | - return I18N::translate('Foster father'); |
|
124 | - case 'foster_mother': |
|
125 | - // always female |
|
126 | - return I18N::translate('Foster mother'); |
|
127 | - case 'friend': |
|
128 | - switch ($sex) { |
|
129 | - case 'M': |
|
130 | - return I18N::translateContext('MALE', 'Friend'); |
|
131 | - case 'F': |
|
132 | - return I18N::translateContext('FEMALE', 'Friend'); |
|
133 | - default: |
|
134 | - return I18N::translate('Friend'); |
|
135 | - } |
|
136 | - case 'godfather': |
|
137 | - // always male |
|
138 | - return I18N::translate('Godfather'); |
|
139 | - case 'godmother': |
|
140 | - // always female |
|
141 | - return I18N::translate('Godmother'); |
|
142 | - case 'godparent': |
|
143 | - switch ($sex) { |
|
144 | - case 'M': |
|
55 | + case 'attendant': |
|
56 | + switch ($sex) { |
|
57 | + case 'M': |
|
58 | + return I18N::translateContext('MALE', 'Attendant'); |
|
59 | + case 'F': |
|
60 | + return I18N::translateContext('FEMALE', 'Attendant'); |
|
61 | + default: |
|
62 | + return I18N::translate('Attendant'); |
|
63 | + } |
|
64 | + case 'attending': |
|
65 | + switch ($sex) { |
|
66 | + case 'M': |
|
67 | + return I18N::translateContext('MALE', 'Attending'); |
|
68 | + case 'F': |
|
69 | + return I18N::translateContext('FEMALE', 'Attending'); |
|
70 | + default: |
|
71 | + return I18N::translate('Attending'); |
|
72 | + } |
|
73 | + case 'best_man': |
|
74 | + // always male |
|
75 | + return I18N::translate('Best man'); |
|
76 | + case 'bridesmaid': |
|
77 | + // always female |
|
78 | + return I18N::translate('Bridesmaid'); |
|
79 | + case 'buyer': |
|
80 | + switch ($sex) { |
|
81 | + case 'M': |
|
82 | + return I18N::translateContext('MALE', 'Buyer'); |
|
83 | + case 'F': |
|
84 | + return I18N::translateContext('FEMALE', 'Buyer'); |
|
85 | + default: |
|
86 | + return I18N::translate('Buyer'); |
|
87 | + } |
|
88 | + case 'circumciser': |
|
89 | + // always male |
|
90 | + return I18N::translate('Circumciser'); |
|
91 | + case 'civil_registrar': |
|
92 | + switch ($sex) { |
|
93 | + case 'M': |
|
94 | + return I18N::translateContext('MALE', 'Civil registrar'); |
|
95 | + case 'F': |
|
96 | + return I18N::translateContext('FEMALE', 'Civil registrar'); |
|
97 | + default: |
|
98 | + return I18N::translate('Civil registrar'); |
|
99 | + } |
|
100 | + case 'employee': |
|
101 | + switch ($sex) { |
|
102 | + case 'M': |
|
103 | + return I18N::translateContext('MALE', 'Employee'); |
|
104 | + case 'F': |
|
105 | + return I18N::translateContext('FEMALE', 'Employee'); |
|
106 | + default: |
|
107 | + return I18N::translate('Employee'); |
|
108 | + } |
|
109 | + case 'employer': |
|
110 | + switch ($sex) { |
|
111 | + case 'M': |
|
112 | + return I18N::translateContext('MALE', 'Employer'); |
|
113 | + case 'F': |
|
114 | + return I18N::translateContext('FEMALE', 'Employer'); |
|
115 | + default: |
|
116 | + return I18N::translate('Employer'); |
|
117 | + } |
|
118 | + case 'foster_child': |
|
119 | + // no sex implied |
|
120 | + return I18N::translate('Foster child'); |
|
121 | + case 'foster_father': |
|
122 | + // always male |
|
123 | + return I18N::translate('Foster father'); |
|
124 | + case 'foster_mother': |
|
125 | + // always female |
|
126 | + return I18N::translate('Foster mother'); |
|
127 | + case 'friend': |
|
128 | + switch ($sex) { |
|
129 | + case 'M': |
|
130 | + return I18N::translateContext('MALE', 'Friend'); |
|
131 | + case 'F': |
|
132 | + return I18N::translateContext('FEMALE', 'Friend'); |
|
133 | + default: |
|
134 | + return I18N::translate('Friend'); |
|
135 | + } |
|
136 | + case 'godfather': |
|
137 | + // always male |
|
145 | 138 | return I18N::translate('Godfather'); |
146 | - case 'F': |
|
139 | + case 'godmother': |
|
140 | + // always female |
|
147 | 141 | return I18N::translate('Godmother'); |
148 | - default: |
|
149 | - return I18N::translate('Godparent'); |
|
150 | - } |
|
151 | - case 'godson': |
|
152 | - // always male |
|
153 | - return I18N::translate('Godson'); |
|
154 | - case 'goddaughter': |
|
155 | - // always female |
|
156 | - return I18N::translate('Goddaughter'); |
|
157 | - case 'godchild': |
|
158 | - switch ($sex) { |
|
159 | - case 'M': |
|
142 | + case 'godparent': |
|
143 | + switch ($sex) { |
|
144 | + case 'M': |
|
145 | + return I18N::translate('Godfather'); |
|
146 | + case 'F': |
|
147 | + return I18N::translate('Godmother'); |
|
148 | + default: |
|
149 | + return I18N::translate('Godparent'); |
|
150 | + } |
|
151 | + case 'godson': |
|
152 | + // always male |
|
160 | 153 | return I18N::translate('Godson'); |
161 | - case 'F': |
|
154 | + case 'goddaughter': |
|
155 | + // always female |
|
162 | 156 | return I18N::translate('Goddaughter'); |
157 | + case 'godchild': |
|
158 | + switch ($sex) { |
|
159 | + case 'M': |
|
160 | + return I18N::translate('Godson'); |
|
161 | + case 'F': |
|
162 | + return I18N::translate('Goddaughter'); |
|
163 | + default: |
|
164 | + return I18N::translate('Godchild'); |
|
165 | + } |
|
166 | + case 'guardian': |
|
167 | + switch ($sex) { |
|
168 | + case 'M': |
|
169 | + return I18N::translateContext('MALE', 'Guardian'); |
|
170 | + case 'F': |
|
171 | + return I18N::translateContext('FEMALE', 'Guardian'); |
|
172 | + default: |
|
173 | + return I18N::translate('Guardian'); |
|
174 | + } |
|
175 | + case 'informant': |
|
176 | + switch ($sex) { |
|
177 | + case 'M': |
|
178 | + return I18N::translateContext('MALE', 'Informant'); |
|
179 | + case 'F': |
|
180 | + return I18N::translateContext('FEMALE', 'Informant'); |
|
181 | + default: |
|
182 | + return I18N::translate('Informant'); |
|
183 | + } |
|
184 | + case 'lodger': |
|
185 | + switch ($sex) { |
|
186 | + case 'M': |
|
187 | + return I18N::translateContext('MALE', 'Lodger'); |
|
188 | + case 'F': |
|
189 | + return I18N::translateContext('FEMALE', 'Lodger'); |
|
190 | + default: |
|
191 | + return I18N::translate('Lodger'); |
|
192 | + } |
|
193 | + case 'nanny': |
|
194 | + // no sex implied |
|
195 | + return I18N::translate('Nanny'); |
|
196 | + case 'nurse': |
|
197 | + switch ($sex) { |
|
198 | + case 'M': |
|
199 | + return I18N::translateContext('MALE', 'Nurse'); |
|
200 | + case 'F': |
|
201 | + return I18N::translateContext('FEMALE', 'Nurse'); |
|
202 | + default: |
|
203 | + return I18N::translate('Nurse'); |
|
204 | + } |
|
205 | + case 'owner': |
|
206 | + switch ($sex) { |
|
207 | + case 'M': |
|
208 | + return I18N::translateContext('MALE', 'Owner'); |
|
209 | + case 'F': |
|
210 | + return I18N::translateContext('FEMALE', 'Owner'); |
|
211 | + default: |
|
212 | + return I18N::translate('Owner'); |
|
213 | + } |
|
214 | + case 'priest': |
|
215 | + // no sex implied |
|
216 | + return I18N::translate('Priest'); |
|
217 | + case 'rabbi': |
|
218 | + // always male |
|
219 | + return I18N::translate('Rabbi'); |
|
220 | + case 'registry_officer': |
|
221 | + switch ($sex) { |
|
222 | + case 'M': |
|
223 | + return I18N::translateContext('MALE', 'Registry officer'); |
|
224 | + case 'F': |
|
225 | + return I18N::translateContext('FEMALE', 'Registry officer'); |
|
226 | + default: |
|
227 | + return I18N::translate('Registry officer'); |
|
228 | + } |
|
229 | + case 'seller': |
|
230 | + switch ($sex) { |
|
231 | + case 'M': |
|
232 | + return I18N::translateContext('MALE', 'Seller'); |
|
233 | + case 'F': |
|
234 | + return I18N::translateContext('FEMALE', 'Seller'); |
|
235 | + default: |
|
236 | + return I18N::translate('Seller'); |
|
237 | + } |
|
238 | + case 'servant': |
|
239 | + switch ($sex) { |
|
240 | + case 'M': |
|
241 | + return I18N::translateContext('MALE', 'Servant'); |
|
242 | + case 'F': |
|
243 | + return I18N::translateContext('FEMALE', 'Servant'); |
|
244 | + default: |
|
245 | + return I18N::translate('Servant'); |
|
246 | + } |
|
247 | + case 'slave': |
|
248 | + switch ($sex) { |
|
249 | + case 'M': |
|
250 | + return I18N::translateContext('MALE', 'Slave'); |
|
251 | + case 'F': |
|
252 | + return I18N::translateContext('FEMALE', 'Slave'); |
|
253 | + default: |
|
254 | + return I18N::translate('Slave'); |
|
255 | + } |
|
256 | + case 'ward': |
|
257 | + switch ($sex) { |
|
258 | + case 'M': |
|
259 | + return I18N::translateContext('MALE', 'Ward'); |
|
260 | + case 'F': |
|
261 | + return I18N::translateContext('FEMALE', 'Ward'); |
|
262 | + default: |
|
263 | + return I18N::translate('Ward'); |
|
264 | + } |
|
265 | + case 'witness': |
|
266 | + // Do we need separate male/female translations for this? |
|
267 | + return I18N::translate('Witness'); |
|
163 | 268 | default: |
164 | - return I18N::translate('Godchild'); |
|
165 | - } |
|
166 | - case 'guardian': |
|
167 | - switch ($sex) { |
|
168 | - case 'M': |
|
169 | - return I18N::translateContext('MALE', 'Guardian'); |
|
170 | - case 'F': |
|
171 | - return I18N::translateContext('FEMALE', 'Guardian'); |
|
172 | - default: |
|
173 | - return I18N::translate('Guardian'); |
|
174 | - } |
|
175 | - case 'informant': |
|
176 | - switch ($sex) { |
|
177 | - case 'M': |
|
178 | - return I18N::translateContext('MALE', 'Informant'); |
|
179 | - case 'F': |
|
180 | - return I18N::translateContext('FEMALE', 'Informant'); |
|
181 | - default: |
|
182 | - return I18N::translate('Informant'); |
|
183 | - } |
|
184 | - case 'lodger': |
|
185 | - switch ($sex) { |
|
186 | - case 'M': |
|
187 | - return I18N::translateContext('MALE', 'Lodger'); |
|
188 | - case 'F': |
|
189 | - return I18N::translateContext('FEMALE', 'Lodger'); |
|
190 | - default: |
|
191 | - return I18N::translate('Lodger'); |
|
192 | - } |
|
193 | - case 'nanny': |
|
194 | - // no sex implied |
|
195 | - return I18N::translate('Nanny'); |
|
196 | - case 'nurse': |
|
197 | - switch ($sex) { |
|
198 | - case 'M': |
|
199 | - return I18N::translateContext('MALE', 'Nurse'); |
|
200 | - case 'F': |
|
201 | - return I18N::translateContext('FEMALE', 'Nurse'); |
|
202 | - default: |
|
203 | - return I18N::translate('Nurse'); |
|
204 | - } |
|
205 | - case 'owner': |
|
206 | - switch ($sex) { |
|
207 | - case 'M': |
|
208 | - return I18N::translateContext('MALE', 'Owner'); |
|
209 | - case 'F': |
|
210 | - return I18N::translateContext('FEMALE', 'Owner'); |
|
211 | - default: |
|
212 | - return I18N::translate('Owner'); |
|
213 | - } |
|
214 | - case 'priest': |
|
215 | - // no sex implied |
|
216 | - return I18N::translate('Priest'); |
|
217 | - case 'rabbi': |
|
218 | - // always male |
|
219 | - return I18N::translate('Rabbi'); |
|
220 | - case 'registry_officer': |
|
221 | - switch ($sex) { |
|
222 | - case 'M': |
|
223 | - return I18N::translateContext('MALE', 'Registry officer'); |
|
224 | - case 'F': |
|
225 | - return I18N::translateContext('FEMALE', 'Registry officer'); |
|
226 | - default: |
|
227 | - return I18N::translate('Registry officer'); |
|
228 | - } |
|
229 | - case 'seller': |
|
230 | - switch ($sex) { |
|
231 | - case 'M': |
|
232 | - return I18N::translateContext('MALE', 'Seller'); |
|
233 | - case 'F': |
|
234 | - return I18N::translateContext('FEMALE', 'Seller'); |
|
235 | - default: |
|
236 | - return I18N::translate('Seller'); |
|
237 | - } |
|
238 | - case 'servant': |
|
239 | - switch ($sex) { |
|
240 | - case 'M': |
|
241 | - return I18N::translateContext('MALE', 'Servant'); |
|
242 | - case 'F': |
|
243 | - return I18N::translateContext('FEMALE', 'Servant'); |
|
244 | - default: |
|
245 | - return I18N::translate('Servant'); |
|
246 | - } |
|
247 | - case 'slave': |
|
248 | - switch ($sex) { |
|
249 | - case 'M': |
|
250 | - return I18N::translateContext('MALE', 'Slave'); |
|
251 | - case 'F': |
|
252 | - return I18N::translateContext('FEMALE', 'Slave'); |
|
253 | - default: |
|
254 | - return I18N::translate('Slave'); |
|
255 | - } |
|
256 | - case 'ward': |
|
257 | - switch ($sex) { |
|
258 | - case 'M': |
|
259 | - return I18N::translateContext('MALE', 'Ward'); |
|
260 | - case 'F': |
|
261 | - return I18N::translateContext('FEMALE', 'Ward'); |
|
262 | - default: |
|
263 | - return I18N::translate('Ward'); |
|
264 | - } |
|
265 | - case 'witness': |
|
266 | - // Do we need separate male/female translations for this? |
|
267 | - return I18N::translate('Witness'); |
|
268 | - default: |
|
269 | - return I18N::translate($type); |
|
269 | + return I18N::translate($type); |
|
270 | 270 | } |
271 | 271 | } |
272 | 272 |
@@ -42,35 +42,35 @@ |
||
42 | 42 | } |
43 | 43 | |
44 | 44 | switch ($type) { |
45 | - case 'BOTH': |
|
46 | - switch ($sex) { |
|
47 | - case 'M': |
|
48 | - return I18N::translateContext('MALE', 'Adopted by both parents'); |
|
49 | - case 'F': |
|
50 | - return I18N::translateContext('FEMALE', 'Adopted by both parents'); |
|
45 | + case 'BOTH': |
|
46 | + switch ($sex) { |
|
47 | + case 'M': |
|
48 | + return I18N::translateContext('MALE', 'Adopted by both parents'); |
|
49 | + case 'F': |
|
50 | + return I18N::translateContext('FEMALE', 'Adopted by both parents'); |
|
51 | + default: |
|
52 | + return I18N::translate('Adopted by both parents'); |
|
53 | + } |
|
54 | + case 'HUSB': |
|
55 | + switch ($sex) { |
|
56 | + case 'M': |
|
57 | + return I18N::translateContext('MALE', 'Adopted by father'); |
|
58 | + case 'F': |
|
59 | + return I18N::translateContext('FEMALE', 'Adopted by father'); |
|
60 | + default: |
|
61 | + return I18N::translate('Adopted by father'); |
|
62 | + } |
|
63 | + case 'WIFE': |
|
64 | + switch ($sex) { |
|
65 | + case 'M': |
|
66 | + return I18N::translateContext('MALE', 'Adopted by mother'); |
|
67 | + case 'F': |
|
68 | + return I18N::translateContext('FEMALE', 'Adopted by mother'); |
|
69 | + default: |
|
70 | + return I18N::translate('Adopted by mother'); |
|
71 | + } |
|
51 | 72 | default: |
52 | - return I18N::translate('Adopted by both parents'); |
|
53 | - } |
|
54 | - case 'HUSB': |
|
55 | - switch ($sex) { |
|
56 | - case 'M': |
|
57 | - return I18N::translateContext('MALE', 'Adopted by father'); |
|
58 | - case 'F': |
|
59 | - return I18N::translateContext('FEMALE', 'Adopted by father'); |
|
60 | - default: |
|
61 | - return I18N::translate('Adopted by father'); |
|
62 | - } |
|
63 | - case 'WIFE': |
|
64 | - switch ($sex) { |
|
65 | - case 'M': |
|
66 | - return I18N::translateContext('MALE', 'Adopted by mother'); |
|
67 | - case 'F': |
|
68 | - return I18N::translateContext('FEMALE', 'Adopted by mother'); |
|
69 | - default: |
|
70 | - return I18N::translate('Adopted by mother'); |
|
71 | - } |
|
72 | - default: |
|
73 | - return $type; |
|
73 | + return $type; |
|
74 | 74 | } |
75 | 75 | } |
76 | 76 |
@@ -33,24 +33,24 @@ |
||
33 | 33 | */ |
34 | 34 | public static function getValue($type) { |
35 | 35 | switch ($type) { |
36 | - case '3': |
|
37 | - return |
|
38 | - /* I18N: Quality of source information - GEDCOM tag “QUAY 3” */ |
|
39 | - I18N::translate('primary evidence'); |
|
40 | - case '2': |
|
41 | - return |
|
42 | - /* I18N: Quality of source information - GEDCOM tag “QUAY 2” */ |
|
43 | - I18N::translate('secondary evidence'); |
|
44 | - case '1': |
|
45 | - return |
|
46 | - /* I18N: Quality of source information - GEDCOM tag “QUAY 1” */ |
|
47 | - I18N::translate('questionable evidence'); |
|
48 | - case '0': |
|
49 | - return |
|
50 | - /* I18N: Quality of source information - GEDCOM tag “QUAY 0” */ |
|
51 | - I18N::translate('unreliable evidence'); |
|
52 | - default: |
|
53 | - return $type; |
|
36 | + case '3': |
|
37 | + return |
|
38 | + /* I18N: Quality of source information - GEDCOM tag “QUAY 3” */ |
|
39 | + I18N::translate('primary evidence'); |
|
40 | + case '2': |
|
41 | + return |
|
42 | + /* I18N: Quality of source information - GEDCOM tag “QUAY 2” */ |
|
43 | + I18N::translate('secondary evidence'); |
|
44 | + case '1': |
|
45 | + return |
|
46 | + /* I18N: Quality of source information - GEDCOM tag “QUAY 1” */ |
|
47 | + I18N::translate('questionable evidence'); |
|
48 | + case '0': |
|
49 | + return |
|
50 | + /* I18N: Quality of source information - GEDCOM tag “QUAY 0” */ |
|
51 | + I18N::translate('unreliable evidence'); |
|
52 | + default: |
|
53 | + return $type; |
|
54 | 54 | } |
55 | 55 | } |
56 | 56 |
@@ -457,25 +457,25 @@ |
||
457 | 457 | $tree->setPreference('WEBMASTER_USER_ID', Auth::id()); |
458 | 458 | $tree->setPreference('LANGUAGE', WT_LOCALE); // Default to the current admin’s language |
459 | 459 | switch (WT_LOCALE) { |
460 | - case 'es': |
|
461 | - $tree->setPreference('SURNAME_TRADITION', 'spanish'); |
|
462 | - break; |
|
463 | - case 'is': |
|
464 | - $tree->setPreference('SURNAME_TRADITION', 'icelandic'); |
|
465 | - break; |
|
466 | - case 'lt': |
|
467 | - $tree->setPreference('SURNAME_TRADITION', 'lithuanian'); |
|
468 | - break; |
|
469 | - case 'pl': |
|
470 | - $tree->setPreference('SURNAME_TRADITION', 'polish'); |
|
471 | - break; |
|
472 | - case 'pt': |
|
473 | - case 'pt-BR': |
|
474 | - $tree->setPreference('SURNAME_TRADITION', 'portuguese'); |
|
475 | - break; |
|
476 | - default: |
|
477 | - $tree->setPreference('SURNAME_TRADITION', 'paternal'); |
|
478 | - break; |
|
460 | + case 'es': |
|
461 | + $tree->setPreference('SURNAME_TRADITION', 'spanish'); |
|
462 | + break; |
|
463 | + case 'is': |
|
464 | + $tree->setPreference('SURNAME_TRADITION', 'icelandic'); |
|
465 | + break; |
|
466 | + case 'lt': |
|
467 | + $tree->setPreference('SURNAME_TRADITION', 'lithuanian'); |
|
468 | + break; |
|
469 | + case 'pl': |
|
470 | + $tree->setPreference('SURNAME_TRADITION', 'polish'); |
|
471 | + break; |
|
472 | + case 'pt': |
|
473 | + case 'pt-BR': |
|
474 | + $tree->setPreference('SURNAME_TRADITION', 'portuguese'); |
|
475 | + break; |
|
476 | + default: |
|
477 | + $tree->setPreference('SURNAME_TRADITION', 'paternal'); |
|
478 | + break; |
|
479 | 479 | } |
480 | 480 | |
481 | 481 | // Genealogy data |
@@ -39,24 +39,24 @@ |
||
39 | 39 | */ |
40 | 40 | public static function create($name) { |
41 | 41 | switch ($name) { |
42 | - case 'paternal': |
|
43 | - return new PaternalSurnameTradition; |
|
44 | - case 'patrilineal': |
|
45 | - return new PatrilinealSurnameTradition; |
|
46 | - case 'matrilineal': |
|
47 | - return new MatrilinealSurnameTradition; |
|
48 | - case 'portuguese': |
|
49 | - return new PortugueseSurnameTradition; |
|
50 | - case 'spanish': |
|
51 | - return new SpanishSurnameTradition; |
|
52 | - case 'polish': |
|
53 | - return new PolishSurnameTradition; |
|
54 | - case 'lithuanian': |
|
55 | - return new LithuanianSurnameTradition; |
|
56 | - case 'icelandic': |
|
57 | - return new IcelandicSurnameTradition; |
|
58 | - default: |
|
59 | - return new DefaultSurnameTradition; |
|
42 | + case 'paternal': |
|
43 | + return new PaternalSurnameTradition; |
|
44 | + case 'patrilineal': |
|
45 | + return new PatrilinealSurnameTradition; |
|
46 | + case 'matrilineal': |
|
47 | + return new MatrilinealSurnameTradition; |
|
48 | + case 'portuguese': |
|
49 | + return new PortugueseSurnameTradition; |
|
50 | + case 'spanish': |
|
51 | + return new SpanishSurnameTradition; |
|
52 | + case 'polish': |
|
53 | + return new PolishSurnameTradition; |
|
54 | + case 'lithuanian': |
|
55 | + return new LithuanianSurnameTradition; |
|
56 | + case 'icelandic': |
|
57 | + return new IcelandicSurnameTradition; |
|
58 | + default: |
|
59 | + return new DefaultSurnameTradition; |
|
60 | 60 | } |
61 | 61 | } |
62 | 62 |
@@ -59,19 +59,19 @@ discard block |
||
59 | 59 | // The individual’s own facts |
60 | 60 | foreach ($controller->record->getFacts() as $fact) { |
61 | 61 | switch ($fact->getTag()) { |
62 | - case 'SEX': |
|
63 | - case 'NAME': |
|
64 | - case 'SOUR': |
|
65 | - case 'OBJE': |
|
66 | - case 'NOTE': |
|
67 | - case 'FAMC': |
|
68 | - case 'FAMS': |
|
69 | - break; |
|
70 | - default: |
|
71 | - if (!array_key_exists('extra_info', Module::getActiveSidebars($controller->record->getTree())) || !ExtraInformationModule::showFact($fact)) { |
|
72 | - $indifacts[] = $fact; |
|
73 | - } |
|
74 | - break; |
|
62 | + case 'SEX': |
|
63 | + case 'NAME': |
|
64 | + case 'SOUR': |
|
65 | + case 'OBJE': |
|
66 | + case 'NOTE': |
|
67 | + case 'FAMC': |
|
68 | + case 'FAMS': |
|
69 | + break; |
|
70 | + default: |
|
71 | + if (!array_key_exists('extra_info', Module::getActiveSidebars($controller->record->getTree())) || !ExtraInformationModule::showFact($fact)) { |
|
72 | + $indifacts[] = $fact; |
|
73 | + } |
|
74 | + break; |
|
75 | 75 | } |
76 | 76 | } |
77 | 77 | |
@@ -79,19 +79,19 @@ discard block |
||
79 | 79 | foreach ($controller->record->getSpouseFamilies() as $family) { |
80 | 80 | foreach ($family->getFacts() as $fact) { |
81 | 81 | switch ($fact->getTag()) { |
82 | - case 'SOUR': |
|
83 | - case 'NOTE': |
|
84 | - case 'OBJE': |
|
85 | - case 'CHAN': |
|
86 | - case '_UID': |
|
87 | - case 'RIN': |
|
88 | - case 'HUSB': |
|
89 | - case 'WIFE': |
|
90 | - case 'CHIL': |
|
91 | - break; |
|
92 | - default: |
|
93 | - $indifacts[] = $fact; |
|
94 | - break; |
|
82 | + case 'SOUR': |
|
83 | + case 'NOTE': |
|
84 | + case 'OBJE': |
|
85 | + case 'CHAN': |
|
86 | + case '_UID': |
|
87 | + case 'RIN': |
|
88 | + case 'HUSB': |
|
89 | + case 'WIFE': |
|
90 | + case 'CHIL': |
|
91 | + break; |
|
92 | + default: |
|
93 | + $indifacts[] = $fact; |
|
94 | + break; |
|
95 | 95 | } |
96 | 96 | } |
97 | 97 | $spouse = $family->getSpouse($controller->record); |
@@ -233,27 +233,27 @@ discard block |
||
233 | 233 | |
234 | 234 | // Deal with recursion. |
235 | 235 | switch ($option) { |
236 | - case '_CHIL': |
|
237 | - // Add grandchildren |
|
238 | - foreach ($family->getChildren() as $child) { |
|
239 | - foreach ($child->getSpouseFamilies() as $cfamily) { |
|
240 | - switch ($child->getSex()) { |
|
241 | - case 'M': |
|
242 | - foreach (self::childFacts($person, $cfamily, '_GCHI', 'son') as $fact) { |
|
243 | - $facts[] = $fact; |
|
244 | - } |
|
245 | - break; |
|
246 | - case 'F': |
|
247 | - foreach (self::childFacts($person, $cfamily, '_GCHI', 'dau') as $fact) { |
|
248 | - $facts[] = $fact; |
|
249 | - } |
|
250 | - break; |
|
251 | - default: |
|
252 | - foreach (self::childFacts($person, $cfamily, '_GCHI', 'chi') as $fact) { |
|
253 | - $facts[] = $fact; |
|
236 | + case '_CHIL': |
|
237 | + // Add grandchildren |
|
238 | + foreach ($family->getChildren() as $child) { |
|
239 | + foreach ($child->getSpouseFamilies() as $cfamily) { |
|
240 | + switch ($child->getSex()) { |
|
241 | + case 'M': |
|
242 | + foreach (self::childFacts($person, $cfamily, '_GCHI', 'son') as $fact) { |
|
243 | + $facts[] = $fact; |
|
244 | + } |
|
245 | + break; |
|
246 | + case 'F': |
|
247 | + foreach (self::childFacts($person, $cfamily, '_GCHI', 'dau') as $fact) { |
|
248 | + $facts[] = $fact; |
|
249 | + } |
|
250 | + break; |
|
251 | + default: |
|
252 | + foreach (self::childFacts($person, $cfamily, '_GCHI', 'chi') as $fact) { |
|
253 | + $facts[] = $fact; |
|
254 | + } |
|
255 | + break; |
|
254 | 256 | } |
255 | - break; |
|
256 | - } |
|
257 | 257 | } |
258 | 258 | } |
259 | 259 | break; |
@@ -418,24 +418,24 @@ discard block |
||
418 | 418 | foreach ($parent->getFacts(WT_EVENTS_DEAT) as $fact) { |
419 | 419 | if ($fact->getDate()->isOK() && Date::compare($birt_date, $fact->getDate()) <= 0 && Date::compare($fact->getDate(), $deat_date) <= 0) { |
420 | 420 | switch ($sosa) { |
421 | - case 1: |
|
422 | - // Convert the event to a close relatives event. |
|
423 | - $rela_fact = clone($fact); |
|
424 | - $rela_fact->setTag('_' . $fact->getTag() . '_PARE'); |
|
425 | - $facts[] = $rela_fact; |
|
426 | - break; |
|
427 | - case 2: |
|
428 | - // Convert the event to a close relatives event |
|
429 | - $rela_fact = clone($fact); |
|
430 | - $rela_fact->setTag('_' . $fact->getTag() . '_GPA1'); |
|
431 | - $facts[] = $rela_fact; |
|
432 | - break; |
|
433 | - case 3: |
|
434 | - // Convert the event to a close relatives event |
|
435 | - $rela_fact = clone($fact); |
|
436 | - $rela_fact->setTag('_' . $fact->getTag() . '_GPA2'); |
|
437 | - $facts[] = $rela_fact; |
|
438 | - break; |
|
421 | + case 1: |
|
422 | + // Convert the event to a close relatives event. |
|
423 | + $rela_fact = clone($fact); |
|
424 | + $rela_fact->setTag('_' . $fact->getTag() . '_PARE'); |
|
425 | + $facts[] = $rela_fact; |
|
426 | + break; |
|
427 | + case 2: |
|
428 | + // Convert the event to a close relatives event |
|
429 | + $rela_fact = clone($fact); |
|
430 | + $rela_fact->setTag('_' . $fact->getTag() . '_GPA1'); |
|
431 | + $facts[] = $rela_fact; |
|
432 | + break; |
|
433 | + case 3: |
|
434 | + // Convert the event to a close relatives event |
|
435 | + $rela_fact = clone($fact); |
|
436 | + $rela_fact->setTag('_' . $fact->getTag() . '_GPA2'); |
|
437 | + $facts[] = $rela_fact; |
|
438 | + break; |
|
439 | 439 | } |
440 | 440 | } |
441 | 441 | } |
@@ -70,25 +70,25 @@ |
||
70 | 70 | * Select GEDCOM |
71 | 71 | */ |
72 | 72 | switch ($gedcom) { |
73 | - case '__current__': |
|
74 | - $stats = new Stats($WT_TREE); |
|
75 | - break; |
|
76 | - case '__default__': |
|
77 | - $tree = Tree::findByName(Site::getPreference('DEFAULT_GEDCOM')); |
|
78 | - if ($tree) { |
|
79 | - $stats = new Stats($tree); |
|
80 | - } else { |
|
73 | + case '__current__': |
|
81 | 74 | $stats = new Stats($WT_TREE); |
82 | - } |
|
83 | - break; |
|
84 | - default: |
|
85 | - $tree = Tree::findByName($gedcom); |
|
86 | - if ($tree) { |
|
87 | - $stats = new Stats($tree); |
|
88 | - } else { |
|
89 | - $stats = new Stats($WT_TREE); |
|
90 | - } |
|
91 | - break; |
|
75 | + break; |
|
76 | + case '__default__': |
|
77 | + $tree = Tree::findByName(Site::getPreference('DEFAULT_GEDCOM')); |
|
78 | + if ($tree) { |
|
79 | + $stats = new Stats($tree); |
|
80 | + } else { |
|
81 | + $stats = new Stats($WT_TREE); |
|
82 | + } |
|
83 | + break; |
|
84 | + default: |
|
85 | + $tree = Tree::findByName($gedcom); |
|
86 | + if ($tree) { |
|
87 | + $stats = new Stats($tree); |
|
88 | + } else { |
|
89 | + $stats = new Stats($WT_TREE); |
|
90 | + } |
|
91 | + break; |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | /* |
@@ -75,16 +75,16 @@ |
||
75 | 75 | |
76 | 76 | $content = ''; |
77 | 77 | switch ($infoStyle) { |
78 | - case 'list': |
|
79 | - // Output style 1: Old format, no visible tables, much smaller text. Better suited to right side of page. |
|
80 | - $content .= FunctionsPrintLists::eventsList($startjd, $endjd, $onlyBDM ? 'BIRT MARR DEAT' : '', $filter, $sortStyle); |
|
81 | - break; |
|
82 | - case 'table': |
|
83 | - // Style 2: New format, tables, big text, etc. Not too good on right side of page |
|
84 | - ob_start(); |
|
85 | - $content .= FunctionsPrintLists::eventsTable($startjd, $endjd, $onlyBDM ? 'BIRT MARR DEAT' : '', $filter, $sortStyle); |
|
86 | - $content .= ob_get_clean(); |
|
87 | - break; |
|
78 | + case 'list': |
|
79 | + // Output style 1: Old format, no visible tables, much smaller text. Better suited to right side of page. |
|
80 | + $content .= FunctionsPrintLists::eventsList($startjd, $endjd, $onlyBDM ? 'BIRT MARR DEAT' : '', $filter, $sortStyle); |
|
81 | + break; |
|
82 | + case 'table': |
|
83 | + // Style 2: New format, tables, big text, etc. Not too good on right side of page |
|
84 | + ob_start(); |
|
85 | + $content .= FunctionsPrintLists::eventsTable($startjd, $endjd, $onlyBDM ? 'BIRT MARR DEAT' : '', $filter, $sortStyle); |
|
86 | + $content .= ob_get_clean(); |
|
87 | + break; |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | if ($template) { |
@@ -101,14 +101,14 @@ |
||
101 | 101 | |
102 | 102 | foreach ($differences as $difference) { |
103 | 103 | switch ($difference[1]) { |
104 | - case MyersDiff::DELETE: |
|
105 | - $diff_lines[] = self::decorateDeletedText($difference[0]); |
|
106 | - break; |
|
107 | - case MyersDiff::INSERT: |
|
108 | - $diff_lines[] = self::decorateInsertedText($difference[0]); |
|
109 | - break; |
|
110 | - default: |
|
111 | - $diff_lines[] = $difference[0]; |
|
104 | + case MyersDiff::DELETE: |
|
105 | + $diff_lines[] = self::decorateDeletedText($difference[0]); |
|
106 | + break; |
|
107 | + case MyersDiff::INSERT: |
|
108 | + $diff_lines[] = self::decorateInsertedText($difference[0]); |
|
109 | + break; |
|
110 | + default: |
|
111 | + $diff_lines[] = $difference[0]; |
|
112 | 112 | } |
113 | 113 | } |
114 | 114 |