Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
apk
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
apk
Commits
a9e84c0e
Commit
a9e84c0e
authored
Oct 06, 2014
by
DrKLO
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added Korean locale, bug fixes
parent
28270a87
Changes
13
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
492 additions
and
27 deletions
+492
-27
build.gradle
TMessagesProj/build.gradle
+1
-1
LocaleController.java
.../src/main/java/org/telegram/android/LocaleController.java
+13
-1
ChatProfileActivity.java
...oj/src/main/java/org/telegram/ui/ChatProfileActivity.java
+1
-1
ChatActivityEnterView.java
...ain/java/org/telegram/ui/Views/ChatActivityEnterView.java
+20
-16
strings.xml
TMessagesProj/src/main/res/values-ar/strings.xml
+1
-1
strings.xml
TMessagesProj/src/main/res/values-de/strings.xml
+1
-1
strings.xml
TMessagesProj/src/main/res/values-es/strings.xml
+1
-1
strings.xml
TMessagesProj/src/main/res/values-it/strings.xml
+1
-1
strings.xml
TMessagesProj/src/main/res/values-ko/strings.xml
+449
-0
strings.xml
TMessagesProj/src/main/res/values-nl/strings.xml
+1
-1
strings.xml
TMessagesProj/src/main/res/values-pt-rBR/strings.xml
+1
-1
strings.xml
TMessagesProj/src/main/res/values-pt-rPT/strings.xml
+1
-1
strings.xml
TMessagesProj/src/main/res/values/strings.xml
+1
-1
No files found.
TMessagesProj/build.gradle
View file @
a9e84c0e
...
...
@@ -80,7 +80,7 @@ android {
defaultConfig
{
minSdkVersion
8
targetSdkVersion
19
versionCode
34
6
versionCode
34
9
versionName
"1.9.3"
}
}
TMessagesProj/src/main/java/org/telegram/android/LocaleController.java
View file @
a9e84c0e
...
...
@@ -216,6 +216,14 @@ public class LocaleController {
sortedLanguages
.
add
(
localeInfo
);
languagesDict
.
put
(
localeInfo
.
shortName
,
localeInfo
);
localeInfo
=
new
LocaleInfo
();
localeInfo
.
name
=
"한국어"
;
localeInfo
.
nameEnglish
=
"Korean"
;
localeInfo
.
shortName
=
"ko"
;
localeInfo
.
pathToFile
=
null
;
sortedLanguages
.
add
(
localeInfo
);
languagesDict
.
put
(
localeInfo
.
shortName
,
localeInfo
);
loadOtherLanguages
();
for
(
LocaleInfo
locale
:
otherLanguages
)
{
...
...
@@ -727,7 +735,11 @@ public class LocaleController {
formatString
=
"h:mm a"
;
}
}
if
(
lang
.
toLowerCase
().
equals
(
"ar"
)
||
lang
.
toLowerCase
().
equals
(
"ko"
))
{
formatterDay
=
FastDateFormat
.
getInstance
(
formatString
,
locale
);
}
else
{
formatterDay
=
FastDateFormat
.
getInstance
(
formatString
,
Locale
.
US
);
}
}
public
static
String
stringForMessageListDate
(
long
date
)
{
...
...
TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java
View file @
a9e84c0e
...
...
@@ -630,7 +630,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
}
if
(
count
!=
0
&&
onlineCount
>
1
)
{
onlineText
.
setText
(
Html
.
fromHtml
(
String
.
format
(
"%s, <font color='#357aa8'>%
d %s</font>"
,
LocaleController
.
formatPluralString
(
"Members"
,
count
),
onlineCount
,
LocaleController
.
formatPluralString
(
"Online"
,
onlineCount
))));
onlineText
.
setText
(
Html
.
fromHtml
(
String
.
format
(
"%s, <font color='#357aa8'>%
s</font>"
,
LocaleController
.
formatPluralString
(
"Members"
,
count
)
,
LocaleController
.
formatPluralString
(
"Online"
,
onlineCount
))));
}
else
{
onlineText
.
setText
(
LocaleController
.
formatPluralString
(
"Members"
,
count
));
}
...
...
TMessagesProj/src/main/java/org/telegram/ui/Views/ChatActivityEnterView.java
View file @
a9e84c0e
...
...
@@ -587,7 +587,7 @@ public class ChatActivityEnterView implements NotificationCenter.NotificationCen
}
int
rotation
=
manager
.
getDefaultDisplay
().
getRotation
();
if
(
height
>
AndroidUtilities
.
dp
(
50
))
{
if
(
height
>
AndroidUtilities
.
dp
(
50
)
&&
keyboardVisible
)
{
if
(
rotation
==
Surface
.
ROTATION_270
||
rotation
==
Surface
.
ROTATION_90
)
{
keyboardHeightLand
=
height
;
ApplicationLoader
.
applicationContext
.
getSharedPreferences
(
"emoji"
,
0
).
edit
().
putInt
(
"kbd_height_land3"
,
keyboardHeightLand
).
commit
();
...
...
@@ -598,14 +598,17 @@ public class ChatActivityEnterView implements NotificationCenter.NotificationCen
}
if
(
emojiPopup
!=
null
&&
emojiPopup
.
isShowing
())
{
WindowManager
wm
=
(
WindowManager
)
ApplicationLoader
.
applicationContext
.
getSystemService
(
Context
.
WINDOW_SERVICE
);
final
WindowManager
.
LayoutParams
layoutParams
=
(
WindowManager
.
LayoutParams
)
emojiPopup
.
getContentView
().
getLayoutParams
();
layoutParams
.
width
=
AndroidUtilities
.
displaySize
.
x
;
int
newHeight
=
0
;
if
(
rotation
==
Surface
.
ROTATION_270
||
rotation
==
Surface
.
ROTATION_90
)
{
layoutParams
.
h
eight
=
keyboardHeightLand
;
newH
eight
=
keyboardHeightLand
;
}
else
{
layoutParams
.
h
eight
=
keyboardHeight
;
newH
eight
=
keyboardHeight
;
}
final
WindowManager
.
LayoutParams
layoutParams
=
(
WindowManager
.
LayoutParams
)
emojiPopup
.
getContentView
().
getLayoutParams
();
if
(
layoutParams
.
width
!=
AndroidUtilities
.
displaySize
.
x
||
layoutParams
.
height
!=
newHeight
)
{
WindowManager
wm
=
(
WindowManager
)
ApplicationLoader
.
applicationContext
.
getSystemService
(
Context
.
WINDOW_SERVICE
);
layoutParams
.
width
=
AndroidUtilities
.
displaySize
.
x
;
layoutParams
.
height
=
newHeight
;
wm
.
updateViewLayout
(
emojiPopup
.
getContentView
(),
layoutParams
);
if
(!
keyboardVisible
)
{
sizeNotifierRelativeLayout
.
post
(
new
Runnable
()
{
...
...
@@ -619,6 +622,7 @@ public class ChatActivityEnterView implements NotificationCenter.NotificationCen
});
}
}
}
boolean
oldValue
=
keyboardVisible
;
keyboardVisible
=
height
>
0
;
...
...
TMessagesProj/src/main/res/values-ar/strings.xml
View file @
a9e84c0e
...
...
@@ -443,7 +443,7 @@
<string
name=
"formatterWeek"
>
EEE
</string>
<string
name=
"formatterDay24H"
>
HH:mm
</string>
<string
name=
"formatterDay12H"
>
h:mm a
</string>
<string
name=
"formatDateAtTime"
>
%1$s
\'الساعة\'
%2$s
</string>
<string
name=
"formatDateAtTime"
>
%1$s
الساعة
%2$s
</string>
<!--Don't change this! Not for localization!-->
<string
name=
"CacheTag"
>
CACHE_TAG
</string>
</resources>
\ No newline at end of file
TMessagesProj/src/main/res/values-de/strings.xml
View file @
a9e84c0e
...
...
@@ -443,7 +443,7 @@
<string
name=
"formatterWeek"
>
EEE
</string>
<string
name=
"formatterDay24H"
>
HH:mm
</string>
<string
name=
"formatterDay12H"
>
h:mm a
</string>
<string
name=
"formatDateAtTime"
>
%1$s
\'um\'
%2$s
</string>
<string
name=
"formatDateAtTime"
>
%1$s
um
%2$s
</string>
<!--Don't change this! Not for localization!-->
<string
name=
"CacheTag"
>
CACHE_TAG
</string>
</resources>
\ No newline at end of file
TMessagesProj/src/main/res/values-es/strings.xml
View file @
a9e84c0e
...
...
@@ -443,7 +443,7 @@
<string
name=
"formatterWeek"
>
EEE
</string>
<string
name=
"formatterDay24H"
>
HH:mm
</string>
<string
name=
"formatterDay12H"
>
h:mm a
</string>
<string
name=
"formatDateAtTime"
>
%1$s
\'a las\'
%2$s
</string>
<string
name=
"formatDateAtTime"
>
%1$s
a las
%2$s
</string>
<!--Don't change this! Not for localization!-->
<string
name=
"CacheTag"
>
CACHE_TAG
</string>
</resources>
\ No newline at end of file
TMessagesProj/src/main/res/values-it/strings.xml
View file @
a9e84c0e
...
...
@@ -443,7 +443,7 @@
<string
name=
"formatterWeek"
>
EEE
</string>
<string
name=
"formatterDay24H"
>
HH:mm
</string>
<string
name=
"formatterDay12H"
>
h:mm a
</string>
<string
name=
"formatDateAtTime"
>
%1$s
\'alle\'
%2$s
</string>
<string
name=
"formatDateAtTime"
>
%1$s
alle
%2$s
</string>
<!--Don't change this! Not for localization!-->
<string
name=
"CacheTag"
>
CACHE_TAG
</string>
</resources>
\ No newline at end of file
TMessagesProj/src/main/res/values-ko/strings.xml
0 → 100644
View file @
a9e84c0e
This diff is collapsed.
Click to expand it.
TMessagesProj/src/main/res/values-nl/strings.xml
View file @
a9e84c0e
...
...
@@ -443,7 +443,7 @@
<string
name=
"formatterWeek"
>
EEE
</string>
<string
name=
"formatterDay24H"
>
HH:mm
</string>
<string
name=
"formatterDay12H"
>
h:mm a
</string>
<string
name=
"formatDateAtTime"
>
%1$s
\'om\'
%2$s
</string>
<string
name=
"formatDateAtTime"
>
%1$s
om
%2$s
</string>
<!--Don't change this! Not for localization!-->
<string
name=
"CacheTag"
>
CACHE_TAG
</string>
</resources>
\ No newline at end of file
TMessagesProj/src/main/res/values-pt-rBR/strings.xml
View file @
a9e84c0e
...
...
@@ -443,7 +443,7 @@
<string
name=
"formatterWeek"
>
EEE
</string>
<string
name=
"formatterDay24H"
>
HH:mm
</string>
<string
name=
"formatterDay12H"
>
h:mm a
</string>
<string
name=
"formatDateAtTime"
>
%1$s
\'às\'
%2$s
</string>
<string
name=
"formatDateAtTime"
>
%1$s
às
%2$s
</string>
<!--Don't change this! Not for localization!-->
<string
name=
"CacheTag"
>
CACHE_TAG
</string>
</resources>
\ No newline at end of file
TMessagesProj/src/main/res/values-pt-rPT/strings.xml
View file @
a9e84c0e
...
...
@@ -443,7 +443,7 @@
<string
name=
"formatterWeek"
>
EEE
</string>
<string
name=
"formatterDay24H"
>
HH:mm
</string>
<string
name=
"formatterDay12H"
>
h:mm a
</string>
<string
name=
"formatDateAtTime"
>
%1$s
\'às\'
%2$s
</string>
<string
name=
"formatDateAtTime"
>
%1$s
às
%2$s
</string>
<!--Don't change this! Not for localization!-->
<string
name=
"CacheTag"
>
CACHE_TAG
</string>
</resources>
\ No newline at end of file
TMessagesProj/src/main/res/values/strings.xml
View file @
a9e84c0e
...
...
@@ -443,7 +443,7 @@
<string
name=
"formatterWeek"
>
EEE
</string>
<string
name=
"formatterDay24H"
>
HH:mm
</string>
<string
name=
"formatterDay12H"
>
h:mm a
</string>
<string
name=
"formatDateAtTime"
>
%1$s
\'at\'
%2$s
</string>
<string
name=
"formatDateAtTime"
>
%1$s
at
%2$s
</string>
<!--Don't change this! Not for localization!-->
<string
name=
"CacheTag"
>
CACHE_TAG
</string>
</resources>
\ No newline at end of file
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