summary refs log tree commit diff stats
path: root/ranger
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-05-17 20:09:42 +0200
committerhut <hut@lavabit.com>2010-05-17 20:09:42 +0200
commitd213c6b6eb252df03e4fbbe97e7e71876da8c309 (patch)
treef923550d138eaac5b099f4eb25ca7d9951dfddea /ranger
parentd0e56912638b2a90bb960574ceb5c0bbbf415aca (diff)
downloadranger-d213c6b6eb252df03e4fbbe97e7e71876da8c309.tar.gz
main: removed unnecessary complex locale handling
Diffstat (limited to 'ranger')
-rw-r--r--ranger/__main__.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/ranger/__main__.py b/ranger/__main__.py
index 887f8e28..f941299e 100644
--- a/ranger/__main__.py
+++ b/ranger/__main__.py
@@ -19,6 +19,7 @@
 import os
 import sys
 import ranger
+import locale
 
 from optparse import OptionParser, SUPPRESS_HELP
 from ranger.ext.openstruct import OpenStruct
@@ -153,14 +154,7 @@ def main():
 		print('ranger requires the python curses module. Aborting.')
 		sys.exit(1)
 
-	# Ensure that a utf8 locale is set.
-	if getdefaultlocale()[1] not in ('utf8', 'UTF-8'):
-		for locale in ('en_US.utf8', 'en_US.UTF-8'):
-			try: setlocale(LC_ALL, locale)
-			except: pass
-			else: break
-		else: setlocale(LC_ALL, '')
-	else: setlocale(LC_ALL, '')
+	locale.setlocale(locale.LC_ALL, '')
 
 	arg = parse_arguments()
 	ranger.arg = arg
ve/commit/commands.lua?id=a54e59446d9f80af9975eaacd226a9efe31b5bb6'>a54e594 ^
e1c5a42 ^


cea2730 ^
e1c5a42 ^



d141822 ^



9013eaa ^
bc464fe ^
9013eaa ^

bc464fe ^
9013eaa ^
36bde53 ^
9013eaa ^
b00232e ^


e1c5a42 ^


d141822 ^




















bc464fe ^
9013eaa ^

bc464fe ^
5c0ce8e ^






9013eaa ^




cea2730 ^

9013eaa ^



89b30a6 ^
e1c5a42 ^
89b30a6 ^
e1c5a42 ^
89b30a6 ^

fd7d36f ^
89b30a6 ^

e1c5a42 ^
9013eaa ^


e1c5a42 ^

fd7d36f ^
690a1c3 ^
fd7d36f ^




690a1c3 ^






fd7d36f ^






e1c5a42 ^
21b1583 ^
bc464fe ^
e1c5a42 ^
fd7d36f ^
e1c5a42 ^
fd7d36f ^
d141822 ^





e1c5a42 ^







21b1583 ^



e1c5a42 ^

21b1583 ^
bc464fe ^















































21b1583 ^




























































d141822 ^




1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295