Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLC-iOS
Commits
b61096d9
Commit
b61096d9
authored
May 14, 2013
by
Gleb Pinigin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Unify naming of localization keys
parent
955a1148
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
16 deletions
+16
-16
AspenProject/VLCAboutViewController.m
AspenProject/VLCAboutViewController.m
+2
-2
AspenProject/VLCMovieViewController.m
AspenProject/VLCMovieViewController.m
+9
-9
AspenProject/VLCPlaylistViewController.m
AspenProject/VLCPlaylistViewController.m
+5
-5
Resources/de.lproj/Localizable.strings
Resources/de.lproj/Localizable.strings
+0
-0
Resources/en.lproj/Localizable.strings
Resources/en.lproj/Localizable.strings
+0
-0
Resources/fr.lproj/Localizable.strings
Resources/fr.lproj/Localizable.strings
+0
-0
Resources/ru.lproj/Localizable.strings
Resources/ru.lproj/Localizable.strings
+0
-0
No files found.
AspenProject/VLCAboutViewController.m
View file @
b61096d9
...
...
@@ -26,8 +26,8 @@
[
super
viewDidLoad
];
self
.
textContents
.
text
=
[
NSString
stringWithContentsOfFile
:[[
NSBundle
mainBundle
]
pathForResource
:
@"About Contents"
ofType
:
@"txt"
]
encoding
:
NSUTF8StringEncoding
error
:
nil
];
self
.
aspenVersion
.
text
=
[
NSString
stringWithFormat
:
NSLocalizedString
(
@"V
ersion: %@
"
,
@""
),
[[
NSBundle
mainBundle
]
objectForInfoDictionaryKey
:
@"CFBundleVersion"
]];
self
.
vlckitVersion
.
text
=
[
NSString
stringWithFormat
:
NSLocalizedString
(
@"B
ased on:
\n
%@
"
,
@""
),[[
VLCLibrary
sharedLibrary
]
version
]];
self
.
aspenVersion
.
text
=
[
NSString
stringWithFormat
:
NSLocalizedString
(
@"V
ERSION_FORMAT
"
,
@""
),
[[
NSBundle
mainBundle
]
objectForInfoDictionaryKey
:
@"CFBundleVersion"
]];
self
.
vlckitVersion
.
text
=
[
NSString
stringWithFormat
:
NSLocalizedString
(
@"B
ASED_ON_FORMAT
"
,
@""
),[[
VLCLibrary
sharedLibrary
]
version
]];
}
-
(
void
)
viewWillAppear
:(
BOOL
)
animated
...
...
AspenProject/VLCMovieViewController.m
View file @
b61096d9
...
...
@@ -45,11 +45,11 @@
self
.
videoFilterView
.
hidden
=
YES
;
_videoFiltersHidden
=
YES
;
_hueLabel
.
text
=
NSLocalizedString
(
@"
Hue
"
,
@""
);
_contrastLabel
.
text
=
NSLocalizedString
(
@"
Contrast
"
,
@""
);
_brightnessLabel
.
text
=
NSLocalizedString
(
@"
Brightness
"
,
@""
);
_saturationLabel
.
text
=
NSLocalizedString
(
@"
Saturation
"
,
@""
);
_gammaLabel
.
text
=
NSLocalizedString
(
@"
Gamma
"
,
@""
);
_hueLabel
.
text
=
NSLocalizedString
(
@"
VFILTER_HUE
"
,
@""
);
_contrastLabel
.
text
=
NSLocalizedString
(
@"
VFILTER_CONTRAST
"
,
@""
);
_brightnessLabel
.
text
=
NSLocalizedString
(
@"
VFILTER_BRIGHTNESS
"
,
@""
);
_saturationLabel
.
text
=
NSLocalizedString
(
@"
VFILTER_SATURATION
"
,
@""
);
_gammaLabel
.
text
=
NSLocalizedString
(
@"
VFILTER_GAMMA
"
,
@""
);
self
.
playbackView
.
hidden
=
YES
;
...
...
@@ -247,12 +247,12 @@
-
(
IBAction
)
switchAudioTrack
:(
id
)
sender
{
_audiotrackActionSheet
=
[[
UIActionSheet
alloc
]
initWithTitle
:
NSLocalizedString
(
@"C
hoose Audio Track
"
,
@"audio track selector"
)
delegate
:
self
cancelButtonTitle
:
nil
destructiveButtonTitle
:
nil
otherButtonTitles
:
nil
];
_audiotrackActionSheet
=
[[
UIActionSheet
alloc
]
initWithTitle
:
NSLocalizedString
(
@"C
HOOSE_AUDIO_TRACK
"
,
@"audio track selector"
)
delegate
:
self
cancelButtonTitle
:
nil
destructiveButtonTitle
:
nil
otherButtonTitles
:
nil
];
NSArray
*
audioTracks
=
[
_mediaPlayer
audioTrackNames
];
NSUInteger
count
=
[
audioTracks
count
];
for
(
NSUInteger
i
=
0
;
i
<
count
;
i
++
)
[
_audiotrackActionSheet
addButtonWithTitle
:
audioTracks
[
i
]];
[
_audiotrackActionSheet
addButtonWithTitle
:
NSLocalizedString
(
@"
Cancel"
,
@"audio track selec
to
r
"
)];
[
_audiotrackActionSheet
addButtonWithTitle
:
NSLocalizedString
(
@"
BUTTON_CANCEL"
,
@"cancel but
to
n
"
)];
[
_audiotrackActionSheet
setCancelButtonIndex
:[
_audiotrackActionSheet
numberOfButtons
]
-
1
];
[
_audiotrackActionSheet
showFromRect
:[
self
.
audioSwitcherButton
frame
]
inView
:
self
.
audioSwitcherButton
animated
:
YES
];
}
...
...
@@ -263,10 +263,10 @@
NSUInteger
count
=
[
spuTracks
count
];
if
(
count
<=
1
)
return
;
_subtitleActionSheet
=
[[
UIActionSheet
alloc
]
initWithTitle
:
NSLocalizedString
(
@"C
hoose Subtitle Track
"
,
@"subtitle track selector"
)
delegate
:
self
cancelButtonTitle
:
nil
destructiveButtonTitle
:
nil
otherButtonTitles
:
nil
];
_subtitleActionSheet
=
[[
UIActionSheet
alloc
]
initWithTitle
:
NSLocalizedString
(
@"C
HOOSE_SUBTITLE_TRACK
"
,
@"subtitle track selector"
)
delegate
:
self
cancelButtonTitle
:
nil
destructiveButtonTitle
:
nil
otherButtonTitles
:
nil
];
for
(
NSUInteger
i
=
0
;
i
<
count
;
i
++
)
[
_subtitleActionSheet
addButtonWithTitle
:
spuTracks
[
i
]];
[
_subtitleActionSheet
addButtonWithTitle
:
NSLocalizedString
(
@"
Cancel"
,
@"subtitle track selec
to
r
"
)];
[
_subtitleActionSheet
addButtonWithTitle
:
NSLocalizedString
(
@"
BUTTON_CANCEL"
,
@"cancel but
to
n
"
)];
[
_subtitleActionSheet
setCancelButtonIndex
:[
_subtitleActionSheet
numberOfButtons
]
-
1
];
[
_subtitleActionSheet
showFromRect
:[
self
.
subtitleSwitcherButton
frame
]
inView
:
self
.
subtitleSwitcherButton
animated
:
YES
];
}
...
...
AspenProject/VLCPlaylistViewController.m
View file @
b61096d9
...
...
@@ -34,7 +34,7 @@
self
.
tableView
.
separatorColor
=
[
UIColor
colorWithWhite
:.
2
alpha
:
1
.];
[
super
viewDidLoad
];
UIBarButtonItem
*
addButton
=
[[
UIBarButtonItem
alloc
]
initWithTitle
:
NSLocalizedString
(
@"
About
"
,
@""
)
style
:
UIBarButtonItemStyleBordered
target
:
self
action
:
@selector
(
showAboutView
:
)];
UIBarButtonItem
*
addButton
=
[[
UIBarButtonItem
alloc
]
initWithTitle
:
NSLocalizedString
(
@"
BUTTON_ABOUT
"
,
@""
)
style
:
UIBarButtonItemStyleBordered
target
:
self
action
:
@selector
(
showAboutView
:
)];
self
.
navigationItem
.
leftBarButtonItem
=
addButton
;
self
.
navigationItem
.
rightBarButtonItem
=
self
.
editButtonItem
;
...
...
@@ -46,7 +46,7 @@
}
self
.
tabBar
.
selectedItem
=
self
.
localFilesBarItem
;
self
.
networkStreamsBarItem
.
title
=
NSLocalizedString
(
@"
Network
"
,
@""
);
self
.
networkStreamsBarItem
.
title
=
NSLocalizedString
(
@"
TABBAR_NETWORK
"
,
@""
);
}
-
(
void
)
viewWillAppear
:(
BOOL
)
animated
...
...
@@ -207,10 +207,10 @@
if
(
_editMode
)
{
self
.
editButtonItem
.
style
=
UIBarButtonItemStyleDone
;
self
.
editButtonItem
.
title
=
NSLocalizedString
(
@"
Done
"
,
@""
);
self
.
editButtonItem
.
title
=
NSLocalizedString
(
@"
BUTTON_DONE
"
,
@""
);
}
else
{
self
.
editButtonItem
.
style
=
UIBarButtonItemStylePlain
;
self
.
editButtonItem
.
title
=
NSLocalizedString
(
@"
Edit
"
,
@""
);
self
.
editButtonItem
.
title
=
NSLocalizedString
(
@"
BUTTON_EDIT
"
,
@""
);
}
}
...
...
@@ -234,7 +234,7 @@
if
(
_pasteURL
&&
!
[[
_pasteURL
scheme
]
isEqualToString
:
@""
]
&&
!
[[
_pasteURL
absoluteString
]
isEqualToString
:
@""
])
{
NSString
*
messageString
=
[
NSString
stringWithFormat
:
@"Do you want to open %@?"
,
[
_pasteURL
absoluteString
]];
UIAlertView
*
alert
=
[[
UIAlertView
alloc
]
initWithTitle
:
@"Open URL?"
message
:
messageString
delegate
:
self
cancelButtonTitle
:
@"Cancel"
otherButtonTitles
:
@"Open"
,
nil
];
UIAlertView
*
alert
=
[[
UIAlertView
alloc
]
initWithTitle
:
@"Open URL?"
message
:
messageString
delegate
:
self
cancelButtonTitle
:
NSLocalizedString
(
@"BUTTON_CANCEL"
,
@""
)
otherButtonTitles
:
NSLocalizedString
(
@"BUTTON_OPEN"
,
@""
)
,
nil
];
[
alert
show
];
}
}
...
...
Resources/de.lproj/Localizable.strings
View file @
b61096d9
B
"CHOOSE_AUDIO_TRACK"="Audiospur wählen";
...
...
Resources/en.lproj/Localizable.strings
View file @
b61096d9
B
"CHOOSE_AUDIO_TRACK"="Choose Audio Track";
...
...
Resources/fr.lproj/Localizable.strings
View file @
b61096d9
B
"CHOOSE_AUDIO_TRACK"="Choisir Piste Audio";
...
...
Resources/ru.lproj/Localizable.strings
View file @
b61096d9
B
"CHOOSE_AUDIO_TRACK"="Выберите аудио поток";
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment