Skip to content

Fix i18n problem that NSBundle initialization parameter cannot be nil. #1629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wolfcon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix i18n problem that NSBundle initialization parameter cannot be nil. #1629

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions MJRefresh/NSBundle+MJRefresh.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ + (NSString *)mj_localizedStringForKey:(NSString *)key value:(NSString *)value

// 如果没有缓存, 则走初始化逻辑
if (mj_defaultI18nBundle == nil) {
mj_defaultI18nBundle = NSBundle.mainBundle;
NSString *language = MJRefreshConfig.defaultConfig.languageCode;
// 如果配置中没有配置语言
if (!language) {
Expand All @@ -66,9 +67,13 @@ + (NSString *)mj_localizedStringForKey:(NSString *)key value:(NSString *)value
bundle = bundle ? bundle : NSBundle.mainBundle;
// 按语言选取语言包
NSString *i18nFolderPath = [bundle pathForResource:language ofType:@"lproj"];
mj_defaultI18nBundle = [NSBundle bundleWithPath:i18nFolderPath];
// 检查语言包, 如果没有查找到, 则默认使用 mainBundle
mj_defaultI18nBundle = mj_defaultI18nBundle ? mj_defaultI18nBundle : NSBundle.mainBundle;
if (i18nFolderPath) {
NSBundle *i18nFolderBundle = [NSBundle bundleWithPath:i18nFolderPath];
// 检查语言包
if (i18nFolderBundle) {
mj_defaultI18nBundle = i18nFolderBundle;
}
}

// 获取 MJRefresh 自有的语言包
if (mj_systemI18nBundle == nil) {
Expand Down