siat 3.2.37__py3-none-any.whl → 3.2.45__py3-none-any.whl

siat/common.py

@@ -3989,6 +3989,105 @@ def show_df(data,search_mode=False):
              }})
     
     return
+
+#==============================================================================
+if __name__ == '__main__':
+    text="MRQ个股流通市值均值"
+    text=["开盘价","收盘价"]
+    to_language='en'
+    list_sep='!'
+    printout=False
+    
+    translate_text_google(text=["开盘价","收盘价"])
+    translate_text_google(text="证券趋势对比")
+    translate_text_google(text="市盈率")
+    translate_text_google(text="MRQ个股流通市值均值")
+
+def translate_text_google(text,to_language='en',list_sep='!',printout=False):
+    """
+    功能：联网翻译，最终都是使用谷歌翻译
+    """
+    from py_trans import PyTranslator
+    #需要谷歌翻译联网
+    try:
+        tr = PyTranslator()
+    except:
+        if printout:
+            print("  #Warning(translate_text_google): translation failed as of no internet connection to Google")
+        return text
+    
+    #检测语言
+    #lang=tr.detect(text)
+    
+    #处理列表
+    text1=text
+    list_type=False
+    if isinstance(text,list):
+        list_type=True
+        text1=list_sep.join(text)
+    
+    success=False
+    #Translate text using Google
+    tresult=tr.google(text1,to_language)
+    if tresult['status']=='success':
+        success=True
+    
+    #Translate text using My Memory
+    if not success:
+        tresult=tr.my_memory(text1,to_language)
+        if tresult['status']=='success':
+            success=True
+    
+    #Translate text using My Memory
+    if not success:
+        tresult=tr.translate_dict(text1,to_language)
+        if tresult['status']=='success':
+            success=True
+    
+    #Translate text using Translate.com
+    if not success:
+        tresult=tr.translate_com(text1,to_language)
+        if tresult['status']=='success':
+            success=True
+            
+    if success:            
+        to_text=tresult['translation']
+    else:
+        to_text=text
+        
+    #处理列表
+    if list_type:
+        to_text=to_text.split(list_sep)
+        
+        to_text2=[]
+        for t in to_text:
+            tt=firstLetterUpper(t.strip())
+            to_text2=to_text2 + [tt]
+            
+        return to_text2
+    else:
+        return firstLetterUpper(to_text)
+    
+
+#==============================================================================
+if __name__ == '__main__':
+    text="MRQ close price"    
+    
+def firstLetterUpper(text):
+    """
+    功能：把英文一句话中每个单词的第一个字母大写，但不改变其余字母的大小写
+    """    
+    text_list=text.split(' ')
+    utext_list=[]
+    for t in text_list:
+        tt=t[0].upper() + t[1:]
+        utext_list=utext_list + [tt]
+        
+    utext=' '.join(utext_list)
+
+    return utext
+
+#==============================================================================
     
 #==============================================================================
 #==============================================================================

siat/grafix.py

@@ -22,6 +22,7 @@ import pandas as pd
 #==============================================================================
 import matplotlib.pyplot as plt
 import matplotlib.dates as mdate
+#import matplotlib.font_manager as fm
 #==============================================================================
 #统一设定绘制的图片大小：数值为英寸，1英寸=100像素
 plt.rcParams['figure.figsize']=(12.8,7.2)
@@ -34,13 +35,19 @@ plt.rcParams['figure.facecolor']='whitesmoke' #背景颜色
 #plt.rcParams['axes.facecolor']='whitesmoke' #背景颜色
 #plt.figure(facecolor='whitesmoke')
 
-
 title_txt_size=16
 ylabel_txt_size=12
 xlabel_txt_size=12
 legend_txt_size=12
 annotate_size=11
 
+if check_language() == "English":
+    title_txt_size=20
+    ylabel_txt_size=16
+    xlabel_txt_size=16
+    legend_txt_size=16
+    annotate_size=13
+
 #设置绘图风格：网格虚线
 plt.rcParams['axes.grid']=False
 #plt.rcParams['grid.color']='steelblue'
@@ -59,9 +66,19 @@ plt.rcParams['ytick.direction'] = 'in'  # 将y轴的刻度方向设置向内内
 #处理绘图汉字乱码问题
 import sys; czxt=sys.platform
 if czxt in ['win32','win64']:
+    #设置中文字体
+    """
     plt.rcParams['font.sans-serif'] = ['SimHei']  # 设置默认字体
     mpfrc={'font.family': 'SimHei'}
-
+    """
+    plt.rcParams['font.sans-serif'] = ['SimHei']  # 设置默认字体
+    mpfrc={'font.family': 'SimHei'}
+    
+    if check_language() == "English":
+        #设置英文字体
+        plt.rcParams['font.sans-serif'] = ['Times New Roman']  # 设置默认字体
+        mpfrc={'font.family': 'Times New Roman'}
+        
 if czxt in ['darwin']: #MacOSX
     plt.rcParams['font.family']= ['Heiti TC']
     mpfrc={'font.family': 'Heiti TC'}
@@ -128,6 +145,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
         df=df0
     #else: df=df0
     
+    print('')
     #先绘制折线图
     date_start=df.index[0]
     date_end=df.index[-1]
@@ -232,18 +250,18 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
     else:
         if isinstance(zeroline,float) or isinstance(zeroline,int):
             hline=zeroline
-            plt.axhline(y=hline,ls=":",c="darkorange",linewidth=3,label="关注值")
+            plt.axhline(y=hline,ls=":",c="darkorange",linewidth=3,label=text_lang("关注值","Attention"))
             haveLegend=True
-            footnote=footnote + "，关注值"+str(hline)
+            footnote=footnote + text_lang("，关注值",", Attention ")+str(hline)
     
     if average_value:
         av=df[colname].mean()
-        plt.axhline(y=av,ls="dashed",c="blueviolet",linewidth=2,label="均值")
+        plt.axhline(y=av,ls="dashed",c="blueviolet",linewidth=2,label=text_lang("均值","Mean"))
         haveLegend=True
         #av=str(round(av,2)) if av < 100 else str(int(av))
         av=str(int(av)) if abs(av) >= 100 else str(round(av,2)) if abs(av) >= 10 else str(round(av,3))
         #footnote=footnote + "，均值"+av
-        footnote="注：期间均值"+av+"；"+footnote
+        footnote=text_lang("注：期间均值","Note: Periodic mean ")+av+"; "+footnote
     
     #绘制趋势线
     #print("--Debug(plot_line): power=",power)
@@ -1160,6 +1178,7 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     firstline=True
     
     #绘制折线图
+    print('')
     y_end_list=[]    
     for c in collist:
         pos=collist.index(c)
@@ -1394,7 +1413,8 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
         lslist=['-','--','-.',':','-','--','-.',':','-','--','-.',':','-','--','-.',':',]
     if colorlist==[]:
         colorlist=['blue','tomato','green','chocolate','darksage','cyan','blueviolet','violet','darkcyan','gold','wheat','silver','darkred','brown','coral','pink',]
-        
+
+    print('')        
     #绘制折线图    
     for c in collist:
         pos=collist.index(c)

siat/luchy_draw.py

@@ -546,7 +546,8 @@ def lucky_draw(draw_limit=2,absent_limit=2,column='Name',pickle_path="student_li
     found=False
     todaydt = str(datetime.date.today())
     prompt="*** Is the lucky person here on site?"
-    prompt2="*** Do you expect to pass?"
+    prompt2="*** Does the lucky person expect to pass?"
+    prompt3="*** Continue luck draw?"
     
     while True:
         while True:
@@ -604,7 +605,9 @@ def lucky_draw(draw_limit=2,absent_limit=2,column='Name',pickle_path="student_li
                             
             if onsite and not onpass:
                 #到场且不pass，结束本轮抽签
-                break
+                proceed=read_yes_no(prompt3)
+                if not proceed:
+                    break
             else:
                 #未到场或pass，继续抽签
                 continue

siat/market_china.py

@@ -907,6 +907,8 @@ def market_detail_china2table(df,titletxt,firstColSpecial=True,leftColAlign='l',
 #==============================================================================
 if __name__=='__main__':
     category='price'
+    category='volume'
+    category='return'
     category='valuation'
     
     facecolor='papayawhip'
@@ -975,25 +977,40 @@ def market_detail_china2(category='price',
     
     # 前置空格个数
     heading=' '*1
+    df.rename(columns={'项目':'Item','上海证券交易所':'Shanghai SE','深圳证券交易所':'Shenzhen SE','北京证券交易所':'Beijing SE'},inplace=True)
     
     if category1=='PRICE':
-        titletxt="中国三大股票交易所横向对比：股价与涨跌"
+        titletxt=text_lang("中国三大股票交易所横向对比：股价与涨跌","China Stock Exchanges: Differences in Price")
         
-        ft0=heading+"信息来源：东方财富，统计时间:"+nowstr+"\n"
-        ft1=heading+"注释：\n"
-        ft2=heading+"☆可交易股票数量：将随着股票停复牌情况变化\n"
-        ft3=heading+"☆昨日指的是上一个交易日\n"
-        ft4=heading+"☆涨速：平均每分钟股价变化率，表示股价变化速度\n"
-        ft5=heading+"☆5分钟涨跌：最新5分钟内股价的涨跌幅度\n"
-        ft6=heading+"☆振幅：最高最低价差绝对值/昨收，表示股价变化活跃程度\n"
-        ft7=heading+"☆涨跌幅：(最新价-昨收)/昨收，表示相对昨日的变化程度\n"
-        ft8=heading+"☆涨跌额：最新价-昨收，表示相对昨日的变化金额\n"
+        ft0=heading+text_lang("信息来源：东方财富，统计时间:","Data source: EM, updated ")+nowstr+"\n"
+        ft1=heading+text_lang("注释：\n","Notes:\n")
+        ft2=heading+text_lang("☆可交易股票数量：将随着股票停复牌情况变化\n","*Tradeable stocks: vary with suspension/resumption\n")
+        ft3=heading+text_lang("☆昨日指的是上一个交易日\n","*Prev: refers to previous trading day\n")
+        ft4=heading+text_lang("☆涨速：平均每分钟股价变化率，表示股价变化速度\n","*Changing speed(涨速): rate of changes per minute\n")
+        ft5=heading+text_lang("☆5分钟涨跌：最新5分钟内股价的涨跌幅度\n","*5 min up-down(5分钟涨跌): changes recent 5 minutes\n")
+        ft6=heading+text_lang("☆振幅：最高最低价差绝对值/昨收，表示股价变化活跃程度\n","*Amplitude(振幅): (High - Low)/Prev Close\n")
+        ft7=heading+text_lang("☆涨跌幅：(最新价-昨收)/昨收，表示相对昨日的变化程度\n","*Change%(涨跌幅): (Current Price/Prev Close - 1\n")
+        ft8=heading+text_lang("☆涨跌额：最新价-昨收，表示相对昨日的变化金额\n","*Change(涨跌额): Current Price - Prev Close\n")
         
-        ft9=heading+"☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n"
-        ft10=heading+"☆若在非交易日或开市前后短期内统计，数据可能出现空缺\n"
+        ft9=heading+text_lang("☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n","*Based on real-time data, vary with time\n")
+        ft10=heading+text_lang("☆若在非交易日或开市前后短期内统计，数据可能出现空缺\n","*Missing data may happen around non-trading time\n")
         
         footnote=ft0+ft1+ft2+ft3+ft4+ft5+ft6+ft7+ft8+ft9+ft10
         
+        itme_list=['Tradeable stocks',
+         'Stock Price Level',
+         '.....Prev close mean',
+         '.....Today open mean',
+         '.....Current price mean',
+         'Stock Price Up-down',
+         '.....Current change%',
+         '.....Last 5 min change%',
+         'Today vs. Prev',
+         '.....Amplitude%',
+         '.....Change% mean',
+         '.....Change mean(RMB)']
+        df['Item']=itme_list
+        
         df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
                            first_col_align='left',second_col_align='right', \
                            last_col_align='right',other_col_align='right', \
@@ -1003,21 +1020,30 @@ def market_detail_china2(category='price',
         
     
     if category1=='VOLUME':
-        titletxt="中国三大股票交易所横向对比：成交状况"
-
-        ft0=heading+"信息来源：东方财富，统计时间:"+nowstr+"\n"
-        ft1=heading+"注：\n"
-        ft2=heading+"☆可交易股票数量：将随着股票停复牌情况变化\n"
-        ft3=heading+"☆成交量：当前成交股数，表示交易活跃度\n"
-        ft4=heading+"☆成交额：当前开市后的累计成交金额\n"
-        ft5=heading+"☆换手率：成交量/流通股数，表示成交量占比\n"
-        ft6=heading+"☆量比：当前每分钟成交量/过去5个交易日均值，表示成交量变化\n"
+        titletxt=text_lang("中国三大股票交易所横向对比：成交状况","China Stock Exchanges: Differences in Volume")
+
+        ft0=heading+text_lang("信息来源：东方财富，统计时间:","Data source: EM, updated ")+nowstr+"\n"
+        ft1=heading+text_lang("注：\n","Notes:\n")
+        ft2=heading+text_lang("☆可交易股票数量：将随着股票停复牌情况变化\n","*Tradeable stocks: vary with suspension/resumption\n")
+        ft3=heading+text_lang("☆成交量：当前成交股数，表示交易活跃度\n","*Volume(成交量): traded number of shares since open today\n")
+        ft4=heading+text_lang("☆成交额：当前开市后的累计成交金额\n","*Amount(成交额): traded dollar amount since open today\n")
+        ft5=heading+text_lang("☆换手率：成交量/流通股数，表示成交量占比\n","*Turnover rate(换手率): volume/outstanding shares\n")
+        ft6=heading+text_lang("☆量比：当前每分钟成交量/过去5个交易日均值，表示成交量变化\n","*Volume ratio(量比): current turnover per min/prev 5 mean\n")
         
-        ft9=heading+"☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n"
-        ft10=heading+"☆若在非开市时间或开市前后短期内统计，数据可能出现空缺\n"
+        ft9=heading+text_lang("☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n","*Based on real-time data, vary with time\n")
+        ft10=heading+text_lang("☆若在非开市时间或开市前后短期内统计，数据可能出现空缺\n","*Missing data may happen around non-trading time\n")
         
         footnote=ft0+ft1+ft2+ft3+ft4+ft5+ft6 + ft9+ft10
         
+        itme_list=['Tradeable stocks',
+         'Volume Level Today',
+         '.....Volume mean(million)',
+         '.....Amount mean(100 millions)',
+         '.....Turnover rate mean %',
+         'Today vs. Prev',
+         '.....Volume ratio(times)']
+        df['Item']=itme_list        
+        
         df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
                            first_col_align='left',second_col_align='right', \
                            last_col_align='right',other_col_align='right', \
@@ -1027,19 +1053,32 @@ def market_detail_china2(category='price',
         
     
     if category1=='RETURN':
-        titletxt="中国三大股票交易所横向对比：投资回报"
+        titletxt=text_lang("中国三大股票交易所横向对比：投资回报","China Stock Exchanges: Differences in Return")
         
-        ft0=heading+"信息来源：东方财富，统计时间:"+nowstr+"\n"
-        ft1=heading+"注：\n"
-        ft2=heading+"☆可交易股票数量：将随着股票停复牌情况变化\n"
-        ft3=heading+"☆MRQ：最近一个季度的滚动数据\n"
-        ft4=heading+"☆YTD：今年以来的累计情况\n"
+        ft0=heading+text_lang("信息来源：东方财富，统计时间:","Data source: EM, updated ")+nowstr+"\n"
+        ft1=heading+text_lang("注：\n","Notes:\n")
+        ft2=heading+text_lang("☆可交易股票数量：将随着股票停复牌情况变化\n","*Tradeable stocks: vary with suspension/resumption\n")
+        ft3=heading+text_lang("☆MRQ：最近一个季度的滚动数据\n","*MRQ: most recent quarter\n")
+        ft4=heading+text_lang("☆YTD：今年以来的累计情况\n","*YTD: year to today\n")
         
-        ft9=heading+"☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n"
-        ft10=heading+"☆若在非开市时间或开市前后短期内统计，数据可能出现空缺\n"
+        ft9=heading+text_lang("☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n","*Based on real-time data, vary with time\n")
+        ft10=heading+text_lang("☆若在非开市时间或开市前后短期内统计，数据可能出现空缺\n","*Missing data may happen around non-trading time\n")
 
         footnote=ft0+ft1+ft2+ft3+ft4 + ft9+ft10
         
+        itme_list=['Tradeable stocks',
+         'MRQ Investment Return',
+         '.....MRQ change% mean',
+         '.....MRQ change% median',
+         '.....MRQ change% std',
+         '.....MRQ rising stock%',
+         'YTD Investment Return',
+         '.....YTD change% mean',
+         '.....YTD change% median',
+         '.....YTD change% std',
+         '.....YTD rising stock%']
+        df['Item']=itme_list 
+        
         df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
                            first_col_align='left',second_col_align='right', \
                            last_col_align='right',other_col_align='right', \
@@ -1049,20 +1088,44 @@ def market_detail_china2(category='price',
         
     
     if category1=='VALUATION':
-        titletxt="中国三大股票交易所横向对比：市值与估值"
+        titletxt=text_lang("中国三大股票交易所横向对比：市值与估值","China Stock Exchanges: Differences in Valuation")
         
-        ft0=heading+"信息来源：东方财富，统计时间:"+nowstr+"\n"
-        ft1=heading+"注：\n"
-        ft2=heading+"☆可交易股票数量：将随着股票停复牌情况变化\n"
-        ft3=heading+"☆市盈率：这里为动态市盈率，即市盈率TTM，过去12个月的连续变化\n"
-        ft4=heading+"☆市净率：这里为静态市净率\n"
-        ft5=heading+"☆标准差/均值=标准差(数值)/均值，提升可比性\n"
+        ft0=heading+text_lang("信息来源：东方财富，统计时间:","Data source: EM, updated ")+nowstr+"\n"
+        ft1=heading+text_lang("注：\n","Notes:\n")
+        ft2=heading+text_lang("☆可交易股票数量：将随着股票停复牌情况变化\n","*Tradeable stocks: vary with suspension/resumption\n")
+        ft3=heading+text_lang("☆市盈率：这里为动态市盈率，即市盈率TTM，过去12个月的连续变化\n","*P/E: price/earnings per share, TTM\n")
+        ft4=heading+text_lang("☆市净率：这里为静态市净率\n","*P/B: price/net asset per share, stationary\n")
+        ft5=heading+text_lang("☆标准差/均值=标准差(数值)/均值，提升可比性\n","*std/mean: degree of variation, better comparability\n")
        
-        ft9=heading+"☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n"
-        ft10=heading+"☆若在非开市时间或开市前后短期内统计，数据可能出现空缺\n"
+        ft9=heading+text_lang("☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n","*Based on real-time data, vary with time\n")
+        ft10=heading+text_lang("☆若在非开市时间或开市前后短期内统计，数据可能出现空缺\n","*Missing data may happen around non-trading time\n")
         
         footnote=ft0+ft1+ft2+ft3+ft4+ft5 + ft9+ft10
         
+        itme_list=['Tradeable stocks',
+         'Total Market Cap (TMC)',
+         '.....Whole Market TMC(trillion)',
+         '.....Stock TMC mean(billion)',
+         '.....Stock TMC median(billion)',
+         '.....Stock TMC std/mean',
+         'Outstanding Market Cap (OMC)',
+         '.....Whole Market OMC(trillion)',
+         '.....Whole Market outstanding %',
+         '.....Stock OMC mean(billion)',
+         '.....Stock OMC median(billion)',
+         '.....Stock OMC std/mean',
+         'Valuation: P/E',
+         '.....Stock P/E mean',
+         '.....Stock P/E median',
+         '.....Stock P/E std/mean',
+         'Valuation: P/B',
+         '.....Stock P/B mean',
+         '.....Stock P/B median',
+         '.....Stock P/B std/mean']
+
+        df['Item']=itme_list 
+
+        
         df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
                            first_col_align='left',second_col_align='right', \
                            last_col_align='right',other_col_align='right', \

siat/security_trend2.py

@@ -112,7 +112,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
                        
                    printout=False,source='auto', \
                    ticker_type='auto', \
-                   facecolor='whitesmoke'):
+                   facecolor='papayawhip'):
 
     """
     功能：组合指令，分析证券指标走势，支持多个证券、多个指标和多种绘图方式。

siat/stock.py

@@ -690,9 +690,11 @@ def security_indicator(ticker,indicator, \
         return erdf3
     
     #titletxt=texttranslate("证券指标运动趋势：")+ticker_name(ticker)
-    titletxt=texttranslate("证券趋势分析：")+ticker_name(ticker,ticker_type=ticker_type)
+    titletxt1=text_lang("证券趋势分析：","Security Trend: ")
+    titletxt=titletxt1+ticker_name(ticker,ticker_type=ticker_type)
     import datetime; todaydt = datetime.date.today()
-    footnote=texttranslate("数据来源：新浪/东方财富/stooq/雅虎财经，")+str(todaydt)
+    sourcetxt=text_lang("数据来源：新浪/东方财富/stooq/雅虎财经，","Data source: Sina/EM/Stooq/Yahoo, ")
+    footnote=sourcetxt+str(todaydt)
     collabel=ectranslate(indicator)
     
     ylabeltxt=ectranslate(indicator)
@@ -773,10 +775,10 @@ def stock_ret(ticker,fromdate,todate, \
         return        
 
     import datetime; todaydt = datetime.date.today()
-    footnote=texttranslate("数据来源：综合新浪/东方财富/stooq/雅虎财经，")+str(todaydt)
+    footnote=text_lang("数据来源：综合新浪/东方财富/stooq/雅虎财经，","Data source: Sina/EM/Stooq/Yahoo, ")+str(todaydt)
     collabel=ectranslate(rtype)
     ylabeltxt=ectranslate(rtype)
-    titletxt=texttranslate("证券趋势分析：")+ticker_name(ticker,ticker_type=ticker_type)+"，收益率"
+    titletxt=text_lang("证券趋势分析：","Security Trend: ")+ticker_name(ticker,ticker_type=ticker_type)+text_lang("，收益率",", Rate of Return")
 
     pltdf=erdf[erdf.index >= fromdate]
     plot_line(pltdf,rtype,collabel,ylabeltxt,titletxt,footnote,datatag=datatag, \
@@ -885,18 +887,18 @@ def security_mindicators(ticker,measures,
     for c in list(df1):
         df1.rename(columns={c:ectranslate(c)},inplace=True)
 
-    y_label='证券指标'
+    y_label=text_lang('证券指标',"Indicator")
     import datetime; todaydt = datetime.date.today()
-    x_label="数据来源：综合新浪/东方财富/stooq/yahoo，"+str(todaydt)
+    x_label=text_lang("数据来源：综合新浪/东方财富/stooq/yahoo，","Data source: Sina/EM/Stooq/Yahoo, ")+str(todaydt)
 
     axhline_value=0
     axhline_label=''
     for c in measures:
         if 'Ret%' in c:
             axhline_value=0
-            axhline_label='指标零线'
+            axhline_label='零线'
             break
-    title_txt="证券趋势分析："+ticker_name(ticker,ticker_type=ticker_type)           
+    title_txt=text_lang("证券趋势分析：","Security Trend: ")+ticker_name(ticker,ticker_type=ticker_type)           
     """
     draw_lines(df1,y_label,x_label,axhline_value,axhline_label,title_txt, \
                data_label=False,resample_freq='H',smooth=smooth,loc=loc,annotate=annotate)
@@ -1012,7 +1014,7 @@ def price_volatility2(pricedf,ticker,fromdate,todate, \
         print("  #Error(price_volatility2)：only support price risk types of",colnames)
         return        
 
-    titletxt=texttranslate("证券趋势分析：")+ticker_name(ticker,ticker_type=ticker_type)+"，价格波动风险"
+    titletxt=text_lang("证券趋势分析：","Security Trend: ")+ticker_name(ticker,ticker_type=ticker_type)+text_lang("，价格波动风险",", Price Volatility Risk")
     import datetime; todaydt = datetime.date.today()
     footnote=texttranslate("数据来源：综合新浪/东方财富/stooq/yahoo，")+str(todaydt)
     collabel=ectranslate(type)
@@ -1131,9 +1133,9 @@ def ret_volatility2(retdf,ticker,fromdate,todate, \
         print("  #Error(ret_volatility2): only support return risk types of",colnames)
         return        
 
-    titletxt=texttranslate("证券趋势分析：")+ticker_name(ticker,ticker_type=ticker_type)+"，收益率波动风险"
+    titletxt=text_lang("证券趋势分析：","Security Trend: ")+ticker_name(ticker,ticker_type=ticker_type)+text_lang("，收益率波动风险",", Return Volatility Risk")
     import datetime; todaydt = datetime.date.today()
-    footnote=texttranslate("数据来源：综合新浪/东方财富/stooq/yahoo，")+str(todaydt)
+    footnote=text_lang("数据来源：综合新浪/东方财富/stooq/yahoo，","Data source: Sina/EM/Stooq/Yahoo, ")+str(todaydt)
     collabel=ectranslate(type)
     ylabeltxt=ectranslate(type)
     pltdf=erdf[erdf.index >= fromdate]
@@ -1248,9 +1250,9 @@ def ret_lpsd2(retdf,ticker,fromdate,todate, \
         print("  #Error(ret_lpsd2): only support return risk types of",colnames)
         return        
 
-    titletxt=texttranslate("证券趋势分析：")+ticker_name(ticker,ticker_type=ticker_type)+"波动损失风险"
+    titletxt=text_lang("证券趋势分析：","Security Trend: ")+ticker_name(ticker,ticker_type=ticker_type)+text_lang("波动损失风险","Volatility Loss Risk")
     import datetime; todaydt = datetime.date.today()
-    footnote=texttranslate("数据来源：综合新浪/东方财富/stooq/yahoo，")+str(todaydt)
+    footnote=text_lang("数据来源：综合新浪/东方财富/stooq/yahoo，","Data source: Sina/EM/Stooq/Yahoo, ")+str(todaydt)
     collabel=ectranslate(rtype)
     ylabeltxt=ectranslate(rtype)
     pltdf=erdf[erdf.index >= fromdate]
@@ -1376,12 +1378,15 @@ def comp_2securities_1measure(df1,df2,measure,twinx=False,loc1='upper left', \
     tname1=ticker_name(ticker1,ticker_type=ticker_type[0])
     tname2=ticker_name(ticker2,ticker_type=ticker_type[1])
     
+    #绘图
+    print('')
+    
     titletxt1=text_lang("证券趋势分析：","Security Trend: ")
     titletxt=titletxt1+tname1+" vs "+tname2
         
     import datetime; todaydt = datetime.date.today()
-    footnote1=text_lang("数据来源：综合/东方财富/stooq/yahoo，","Source: integrating sina/eastmoney/stooq/yahoo，")
-    footnote=footnote1+str(todaydt)+"统计"
+    footnote1=text_lang("数据来源：综合/东方财富/stooq/yahoo，","Data source: Sina/EM/Stooq/Yahoo, ")
+    footnote=footnote1+str(todaydt)+text_lang("统计","")
 
     plot_line2(df1,ticker1,measure,label,df2,ticker2,measure,label, \
                    ylabeltxt,titletxt,footnote,zeroline=zeroline,twinx=twinx, \
@@ -1738,6 +1743,9 @@ def compare_msecurity(tickers,measure,start,end, \
             title_txt=title_txt+', '+title_txt2  
         else:
             title_txt=title_txt+': '+title_txt2
+            
+        axhline_value=0
+        axhline_label="零线"
 
     # 标准化处理
     try:
@@ -2033,7 +2041,7 @@ def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10], \
          )       
     
     # add a title the the correct axes, 0=first subfigure
-    titletxt=titletxt+"：K线图走势，日移动均线="+str(mav)
+    titletxt=titletxt+text_lang("：K线图走势，日移动均线=",": Candlestick Chart, MAV Days=")+str(mav)
     axlist[0].set_title(titletxt,
                         fontsize=16,
                         #style='italic',
@@ -2041,9 +2049,9 @@ def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10], \
                         loc='center')
     
     #设置图例，注意前两个为图中期间开始日期的线和柱子
-    mav_labels=['期间首日线','期间首日柱']
+    mav_labels=[text_lang('期间首日线','Day 1(line)'),text_lang('期间首日柱','Day 1(bar)')]
     for d in mav:
-        mav_labels=mav_labels+[str(d)+"日移动均线"]
+        mav_labels=mav_labels+[str(d)+text_lang("日移动均线","-day MAV line")]
     axlist[0].legend(mav_labels,loc=loc)
     """
     #去掉前两个无用的图例
@@ -2107,8 +2115,8 @@ def candlestick_pro(stkcd,fromdate,todate, \
              tight_layout=True,
              xrotation=15,
              title=titletxt,
-             ylabel=texttranslate("价格"),
-             ylabel_lower=texttranslate("成交量"),
+             ylabel=text_lang("价格","Price"),
+             ylabel_lower=text_lang("成交量","Volume"),
              figratio=(12.8,7.2)             
              )       
     reset_plt()
@@ -2195,7 +2203,8 @@ def candlestick_demo(stkcd,fromdate,todate, \
     #change 1st column of b to number type
     import matplotlib.dates as dt2
     b[:,0] = dt2.date2num(b[:,0])	
-     
+    
+    print('')
     #specify the size of the graph
     #fig,ax=plt.subplots(figsize=(10,6))	
     fig,ax=plt.subplots()
@@ -2228,19 +2237,19 @@ def candlestick_demo(stkcd,fromdate,todate, \
     fig.autofmt_xdate()
     fig.gca().set_facecolor(facecolor)
 
-    titletxt0=text_lang("K线图/蜡烛图演示：","Security Price Candlestick Demo: ")
+    titletxt0=text_lang("K线图/蜡烛图演示：","Candlestick Chart Demo: ")
     titletxt=titletxt0 + ticker_name(str(stkcd),ticker_type=ticker_type)
     price_txt=text_lang('价格','Price')
-    source_txt=text_lang("数据来源: 综合","Data source: integrating ")
+    source_txt=text_lang("数据来源: 综合新浪/Stooq/雅虎等","Data source: Sina/Stooq/Yahoo")
 
     plt.title(titletxt,fontsize=title_txt_size,fontweight='bold')
     plt.ylabel(price_txt,fontsize=ylabel_txt_size)
     
     plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
-    plt.gca().set_facecolor('whitesmoke')
+    plt.gca().set_facecolor(facecolor)
     #plt.xticks(rotation=30)        
     plt.legend(loc="best",fontsize=legend_txt_size)    
-    plt.xlabel(source_txt+"sina/stooq/yahoo",fontsize=xlabel_txt_size)   
+    plt.xlabel(source_txt,fontsize=xlabel_txt_size)   
     plt.show()
     
     return p
@@ -3724,13 +3733,8 @@ def compare_mmeasure(ticker,measures,fromdate,todate, \
     y_label=''
     import datetime; today = datetime.date.today()
     
-    lang=check_language()
-    if lang == 'English':
-        x_label="Source: sina/stooq/yahoo, "+str(today)
-        title_txt="Compare A Security's Multiple Measurements: "+ticker_name(ticker)
-    else:
-        x_label="数据来源: 综合新浪/Yahoo/stooq，"+str(today)
-        title_txt="证券趋势分析："+ticker_name(ticker)
+    x_label=text_lang("数据来源: 综合新浪/Yahoo/stooq，","Data source: Sina/Yahoo/Stooq, ")+str(today)
+    title_txt=text_lang("证券趋势分析：","Security Trend: ")+ticker_name(ticker)
         
     draw_lines(df3,y_label=y_label,x_label=x_label, \
                axhline_value=axhline_value,axhline_label=axhline_label, \

siat/stock_technical.py

@@ -954,7 +954,7 @@ def stock_MACD(ticker,start='default',end='default', \
     if (graph in ['MA',['MA']]) or ('ALL' in graph):    
         MA_cols=[]
         for mad in MA_days:
-            col='MA'+str(mad)+'简单移动均线'
+            col='MA'+str(mad)+text_lang('简单移动均线',' Simple MA Line')
             MA_cols=MA_cols+[col]
             df[col] = talib.MA(df['Close'],timeperiod=mad)
         
@@ -974,10 +974,10 @@ def stock_MACD(ticker,start='default',end='default', \
         # 限定日期范围
         df1=df[(df.index >= startpd) & (df.index <= endpd)]    
     
-        y_label="价格"
+        y_label=text_lang("价格","Price")
         import datetime as dt; today=dt.date.today()    
-        source="数据来源：sina/yahoo/stooq/fred，"+str(today)
-        footnote="MA参数："+str(MA_days)
+        source=text_lang("数据来源：Sina/Yahoo/Stooq，","Data source: Sina/Yahoo/Stooq, ")+str(today)
+        footnote=text_lang("MA参数：","MA days=")+str(MA_days)
         x_label=footnote+'\n'+source
         
         axhline_value=0
@@ -985,9 +985,9 @@ def stock_MACD(ticker,start='default',end='default', \
     
         # 简单移动均线MA绘图：moving average
         df2=df1[['Close']+MA_cols]
-        df2.rename(columns={'Close':'收盘价'},inplace=True)
+        df2.rename(columns={'Close':text_lang('收盘价','Close')},inplace=True)
         
-        title_txt="证券价格走势分析："+ticker_name(ticker,ticker_type)+"，简单移动均线"
+        title_txt=text_lang("证券价格走势分析：","Security Trend: ")+ticker_name(ticker,ticker_type)+text_lang("，简单移动均线",", Simple MA Line")
         
         print("  Rendering graphics ...")
         draw_lines(df2,y_label,x_label,axhline_value,axhline_label,title_txt, \
@@ -995,7 +995,7 @@ def stock_MACD(ticker,start='default',end='default', \
     
         if printout:
             if len(dft3)!=0:            
-                print("\n== 简单移动均线交叉 ==")
+                print(text_lang("\n== 简单移动均线交叉 ==","\n== Simple MA Line =="))
                 alignlist=['left','center']
                 print(dft3[['日期','交叉类型']].to_markdown(index=False,tablefmt='plain',colalign=alignlist))
             else:
@@ -1013,7 +1013,7 @@ def stock_MACD(ticker,start='default',end='default', \
     if ('EMA' in graph) or ('ALL' in graph):
         EMA_cols=[]
         for mad in EMA_days:
-            col='EMA'+str(mad)+'指数移动平均线'
+            col='EMA'+str(mad)+text_lang('指数移动均线',' Exponential MA Line')
             EMA_cols=EMA_cols+[col]
             df[col] = talib.EMA(df['Close'],timeperiod=mad)
         
@@ -1033,24 +1033,24 @@ def stock_MACD(ticker,start='default',end='default', \
         # 限定日期范围
         df1=df[(df.index >= startpd) & (df.index <= endpd)]    
     
-        y_label="价格"
+        y_label=text_lang("价格","Price")
         import datetime as dt; today=dt.date.today()    
-        source="数据来源：sina/yahoo/stooq/fred，"+str(today)
-        footnote="EMA参数："+str(EMA_days)
+        source=text_lang("数据来源：Sina/Yahoo/Stooq，","Data source: Sina/Yahoo/Stooq, ")+str(today)
+        footnote=text_lang("EMA参数：","EMA days=")+str(EMA_days)
         x_label=footnote+'\n'+source
         
         axhline_value=0
         axhline_label=''
         
         df3=df1[['Close']+EMA_cols]
-        df3.rename(columns={'Close':'收盘价'},inplace=True)
-        title_txt="证券价格走势分析："+ticker_name(ticker,ticker_type)+"，指数移动平均线"
+        df3.rename(columns={'Close':text_lang('收盘价','Close')},inplace=True)
+        title_txt=text_lang("证券价格走势分析：","Security Trend: ")+ticker_name(ticker,ticker_type)+text_lang("，指数移动平均线","Exponential MA Line")
         draw_lines(df3,y_label,x_label,axhline_value,axhline_label,title_txt, \
                    data_label=False,resample_freq=resample_freq,smooth=smooth,linewidth=linewidth*2)        
 
         if printout:
             if len(dft3)!=0:            
-                print("\n== 指数移动平均线交叉 ==")
+                print(text_lang("\n== 指数移动平均线交叉 ==","\n== Exponential MA Line Cross =="))
                 alignlist=['left','center']
                 print(dft3[['日期','交叉类型']].to_markdown(index=False,tablefmt='plain',colalign=alignlist))
             else:
@@ -1109,10 +1109,10 @@ def stock_MACD(ticker,start='default',end='default', \
         # MACD绘图
         df4=df1[['Close','DIF','DEA','MACD']]
         df4.rename(columns={'Close':'收盘价','DIF':'快线DIF','DEA':'慢线DEA','MACD':'柱线MACD'},inplace=True)
-        title_txt="证券价格走势分析："+ticker_name(ticker,ticker_type)+"，MACD"
+        title_txt=text_lang("证券价格走势分析：","Security Trend: ")+ticker_name(ticker,ticker_type)+"，MACD"
         
         import datetime as dt; today=dt.date.today()    
-        source="数据来源：sina/yahoo/stooq/fred，"+str(today)
+        source=text_lang("数据来源：Sina/Yahoo/Stooq，","Data source: Sina/Yahoo/Stooq, ")+str(today)
         
         #设置绘图风格：关闭网格虚线
         plt.rcParams['axes.grid']=False
@@ -1123,8 +1123,8 @@ def stock_MACD(ticker,start='default',end='default', \
         ax.patch.set_facecolor('black')
         
         # 绘制曲线
-        ax.plot(df4['快线DIF'],label='快线DIF',linewidth=linewidth*2,color='white')
-        ax.plot(df4['慢线DEA'],label='慢线DEA',linewidth=linewidth*2,color='orange')
+        ax.plot(df4['快线DIF'],label=text_lang('快线DIF','DIF(Fast line)'),linewidth=linewidth*2,color='white')
+        ax.plot(df4['慢线DEA'],label=text_lang('慢线DEA','DEA(Slow line)'),linewidth=linewidth*2,color='orange')
         
         # 绘制红绿柱子
         """
@@ -1137,16 +1137,16 @@ def stock_MACD(ticker,start='default',end='default', \
         macd_plus=df4[df4['柱线MACD']>=0]
         macd_minus=df4[df4['柱线MACD']<=0]
         ax.bar(macd_plus.index,macd_plus['柱线MACD'],color='red',alpha=0.5)
-        ax.bar(macd_minus.index,macd_minus['柱线MACD'],color='green',label='柱线MACD',alpha=0.5)
+        ax.bar(macd_minus.index,macd_minus['柱线MACD'],color='green',label=text_lang('柱线MACD','MACD(Bar chart)'),alpha=0.5)
         
         # 绘制水平辅助线
         #plt.axhline(y=0,label='指标零线',color='cyan',linestyle=':',linewidth=linewidth*2) 
         plt.axhline(y=0,label='',color='cyan',linestyle=':',linewidth=linewidth*2) 
         
         # 设置左侧坐标轴
-        ax.set_ylabel('DIF/DEA/MACD指标',fontsize=ylabel_txt_size)
+        ax.set_ylabel(text_lang('DIF/DEA/MACD指标','DIF/DEA/MACD'),fontsize=ylabel_txt_size)
         
-        footnote="MACD参数："+str([MACD_fastperiod,MACD_slowperiod,MACD_signalperiod])
+        footnote="MACD days="+str([MACD_fastperiod,MACD_slowperiod,MACD_signalperiod])
         x_label=footnote+'\n'+source
         ax.set_xlabel(x_label,fontsize=xlabel_txt_size)
         ax.legend(loc=loc1,fontsize=legend_txt_size)
@@ -1164,10 +1164,10 @@ def stock_MACD(ticker,start='default',end='default', \
             df5=df4
         
         ax2 = ax.twinx()
-        ax2.plot(df5['收盘价'],label='收盘价',linewidth=linewidth,color=price_line_color,ls='--')
+        ax2.plot(df5['收盘价'],label=text_lang('收盘价','Close'),linewidth=linewidth,color=price_line_color,ls='--')
         
         # 右侧坐标轴标记
-        ax2.set_ylabel('收盘价',fontsize=ylabel_txt_size)
+        ax2.set_ylabel(text_lang('收盘价','Close'),fontsize=ylabel_txt_size)
         ax2.legend(loc=loc2,fontsize=legend_txt_size)
         
         # 图示标题
@@ -1179,7 +1179,7 @@ def stock_MACD(ticker,start='default',end='default', \
 
         if printout:
             if len(dft3)!=0:
-                print("\n== DIF与DEA交叉 ==")
+                print(text_lang("\n== DIF与DEA交叉 ==","\n== Cross of DIF and DEA"))
                 alignlist=['left','center']
                 print(dft3[['日期','交叉类型']].to_markdown(index=False,tablefmt='plain',colalign=alignlist))
             else:
@@ -1358,11 +1358,11 @@ def stock_RSI(ticker,start='default',end='default', \
         # RSI绘图
         df4=df1[['Close']+RSI_cols]
         df4.rename(columns={'Close':'收盘价'},inplace=True)
-        title_txt="证券价格走势分析："+ticker_name(ticker,ticker_type)+"，RSI"
+        title_txt=text_lang("证券价格走势分析：","Security Trend: ")+ticker_name(ticker,ticker_type)+text_lang("，RSI",", RSI")
         
         import datetime as dt; today=dt.date.today()    
-        source="数据来源：sina/yahoo/stooq/fred，"+str(today)
-        footnote="RSI参数："+str(RSI_days)
+        source=text_lang("数据来源：Sina/Yahoo/Stooq，","Data source: Sina/Yahoo/Stooq, ")+str(today)
+        footnote=text_lang("RSI参数：","RSI days=")+str(RSI_days)
         x_label=footnote+'\n'+source
         
         # 设置绘图区的背景颜色为黑色
@@ -1372,11 +1372,11 @@ def stock_RSI(ticker,start='default',end='default', \
         
         # 绘制曲线
         if ('RSI1' in graph) or ('ALL' in graph):
-            ax.plot(df4['RSI1'],label='快速(周)线RSI1',linewidth=linewidth*2,color='orange')
+            ax.plot(df4['RSI1'],label=text_lang('快速(周)线RSI1','RSI1(1 week, Fast line)'),linewidth=linewidth*2,color='orange')
         if ('RSI2' in graph) or ('ALL' in graph):
-            ax.plot(df4['RSI2'],label='中速(双周)线RSI2',linewidth=linewidth*2,color='purple')
+            ax.plot(df4['RSI2'],label=text_lang('中速(双周)线RSI2','RSI2(2 weeks, Mid line)'),linewidth=linewidth*2,color='purple')
         if ('RSI3' in graph) or ('ALL' in graph):
-            ax.plot(df4['RSI3'],label='慢速(月)线RSI3',linewidth=linewidth*2,color='white')
+            ax.plot(df4['RSI3'],label=text_lang('慢速(月)线RSI3','RSI3(1 month, Slow line)'),linewidth=linewidth*2,color='white')
         
         # 绘制水平辅助线
         hl_linestyle_list=['dashed','-.','dotted']
@@ -1387,7 +1387,7 @@ def stock_RSI(ticker,start='default',end='default', \
             plt.axhline(y=hl,label='',color='cyan',linestyle=hl_ls,linewidth=linewidth) 
         
         # 设置左侧坐标轴
-        ax.set_ylabel('RSI指标',fontsize=ylabel_txt_size)
+        ax.set_ylabel(text_lang('RSI指标','RSI'),fontsize=ylabel_txt_size)
         ax.set_xlabel(x_label,fontsize=xlabel_txt_size)
         ax.legend(loc=loc1,fontsize=legend_txt_size)
         
@@ -1405,10 +1405,10 @@ def stock_RSI(ticker,start='default',end='default', \
             df5=df4
         
         ax2 = ax.twinx()
-        ax2.plot(df5['收盘价'],label='收盘价',linewidth=linewidth,color=price_line_color,ls='--')
+        ax2.plot(df5['收盘价'],label=text_lang('收盘价','Close'),linewidth=linewidth,color=price_line_color,ls='--')
         
         # 右侧坐标轴标记
-        ax2.set_ylabel('收盘价',fontsize=ylabel_txt_size)
+        ax2.set_ylabel(text_lang('收盘价','Close'),fontsize=ylabel_txt_size)
         ax2.legend(loc=loc2,fontsize=legend_txt_size)
         
         # 图示标题
@@ -1421,7 +1421,7 @@ def stock_RSI(ticker,start='default',end='default', \
         if printout:
             if (('RSI1' in graph) & ('RSI3' in graph)) or ('ALL' in graph):
                 if len(dft1c)!=0:
-                    print("\n=== RSI1与RSI3的交叉点 ===")
+                    print(text_lang("\n=== RSI1与RSI3的交叉点 ===","\n=== Cross of RSI1 & RSI3"))
                     alignlist=['left','center']
                     print(dft1c[['日期','RSI1/3交叉类型']].to_markdown(index=False,tablefmt='plain',colalign=alignlist))
                 else:
@@ -1429,7 +1429,7 @@ def stock_RSI(ticker,start='default',end='default', \
         if printout:
             if (('RSI2' in graph) & ('RSI3' in graph)) or ('ALL' in graph):
                 if len(dft2c)!=0:
-                    print("\n=== RSI2与RSI3的交叉点 ===")
+                    print(text_lang("\n=== RSI2与RSI3的交叉点 ===","\n=== Cross of RSI2 & RSI3"))
                     alignlist=['left','center']
                     print(dft2c[['日期','RSI2/3交叉类型']].to_markdown(index=False,tablefmt='plain',colalign=alignlist))
                 else:
@@ -1627,11 +1627,11 @@ def stock_KDJ(ticker,start='default',end='default', \
         # 绘图
         df4=df1[['Close']+KDJ_cols]
         df4.rename(columns={'Close':'收盘价'},inplace=True)
-        title_txt="证券价格走势分析："+ticker_name(ticker,ticker_type)+"，KDJ"
+        title_txt=text_lang("证券价格走势分析：","Security Trend: ")+ticker_name(ticker,ticker_type)+text_lang("，KDJ",", KDJ")
         
         import datetime as dt; today=dt.date.today()    
-        source="数据来源：sina/yahoo/stooq/fred，"+str(today)
-        footnote="KDJ参数："+str(KDJ_days)
+        source=text_lang("数据来源：Sina/Yahoo/Stooq，","Data source: Sina/Yahoo/Stooq, ")+str(today)
+        footnote=text_lang("KDJ参数：","KDJ days=")+str(KDJ_days)
         x_label=footnote+'\n'+source
         
         # 设置绘图区的背景颜色为黑色
@@ -1641,11 +1641,11 @@ def stock_KDJ(ticker,start='default',end='default', \
         
         # 绘制曲线
         if ('K' in graph) or ('ALL' in graph):
-            ax.plot(df4['K'],label='快速线K',linewidth=linewidth*2,color='orange')
+            ax.plot(df4['K'],label=text_lang('快速线K','K line(Fast)'),linewidth=linewidth*2,color='orange')
         if ('D' in graph) or ('ALL' in graph):
-            ax.plot(df4['D'],label='慢速线D',linewidth=linewidth*2,color='green')
+            ax.plot(df4['D'],label=text_lang('慢速线D','D line(Slow)'),linewidth=linewidth*2,color='green')
         if ('J' in graph) or ('ALL' in graph):
-            ax.plot(df4['J'],label='超快确认线J',linewidth=linewidth*2,color='purple')
+            ax.plot(df4['J'],label=text_lang('超快确认线J','J line(Faster, confirm)'),linewidth=linewidth*2,color='purple')
         
         # 绘制水平辅助线: 某些情况下不绘制，以便展现KDJ线细节
         maxK=df4['K'].max()
@@ -1675,7 +1675,7 @@ def stock_KDJ(ticker,start='default',end='default', \
                 plt.axhline(y=hl,label='',color=hl_color,linestyle=hl_ls,linewidth=linewidth) 
         
         # 设置左侧坐标轴
-        ax.set_ylabel('KDJ指标',fontsize=ylabel_txt_size)
+        ax.set_ylabel(text_lang('KDJ指标','KDJ'),fontsize=ylabel_txt_size)
         ax.set_xlabel(x_label,fontsize=xlabel_txt_size)
         ax.legend(loc=loc1,fontsize=legend_txt_size)
         
@@ -1699,10 +1699,10 @@ def stock_KDJ(ticker,start='default',end='default', \
             df5=df4
         
         ax2 = ax.twinx()
-        ax2.plot(df5['收盘价'],label='收盘价',linewidth=linewidth,color=price_line_color,ls='--')
+        ax2.plot(df5['收盘价'],label=text_lang('收盘价','Close'),linewidth=linewidth,color=price_line_color,ls='--')
         
         # 右侧坐标轴标记
-        ax2.set_ylabel('收盘价',fontsize=ylabel_txt_size)
+        ax2.set_ylabel(text_lang('收盘价','Close'),fontsize=ylabel_txt_size)
         ax2.legend(loc=loc2,fontsize=legend_txt_size)
         
         # 图示标题
@@ -1716,14 +1716,14 @@ def stock_KDJ(ticker,start='default',end='default', \
             alignlist=['left','center']
             if (('J' in graph) & ('K' in graph)) or ('ALL' in graph):
                 if len(dft1c)!=0:
-                    print("\n**** J线与K线的交叉点")
+                    print(text_lang("\n**** J线与K线的交叉点","\n**** Cross of J & K Lines"))
                     print(dft1c[['日期','交叉类型']].to_markdown(index=False,tablefmt='plain',colalign=alignlist))
                 else:
                     print("  Note: no J/K cross of lines incurred for",ticker,"from",start,"to",end)
  
             if (('J' in graph) & ('D' in graph)) or ('ALL' in graph):
                 if len(dft2c)!=0:
-                    print("\n**** J线与K线的交叉点")
+                    print(text_lang("\n**** J线与D线的交叉点","\n**** Cross of J & D Lines"))
                     alignlist=['left','center']
                     print(dft2c[['日期','交叉类型']].to_markdown(index=False,tablefmt='plain',colalign=alignlist))
                 else:
@@ -1731,7 +1731,7 @@ def stock_KDJ(ticker,start='default',end='default', \
  
             if (('K' in graph) & ('D' in graph)) or ('ALL' in graph):
                 if len(dft3c)!=0:
-                    print("\n**** K线与D线的交叉点")
+                    print(text_lang("\n**** K线与D线的交叉点","\n**** Cross of K & D Lines"))
                     alignlist=['left','center']
                     print(dft3c[['日期','交叉类型']].to_markdown(index=False,tablefmt='plain',colalign=alignlist))
                 else:
@@ -2241,19 +2241,19 @@ def security_bollinger(ticker,fromdate,todate,boll_days=20, \
     pricedf['blower']=pricedf["bmiddle"] - pricedf['bsd']*2
     
     df=pricedf[['bupper','bmiddle','blower','Close']]
-    df.rename(columns={'bupper':'上(压力)线','bmiddle':'中(界)线','blower':'下(支撑)线','Close':'收盘价'},inplace=True)
+    df.rename(columns={'bupper':text_lang('上(压力)线','Upper Line'),'bmiddle':text_lang('中(界)线','Mid Line'),'blower':text_lang('下(支撑)线','Lower Line'),'Close':text_lang('收盘价','Close')},inplace=True)
 
     # 截取时间段
     result,start,end=check_period(fromdate,todate)
     df1=df[(df.index >= start) & (df.index <= end)]
 
-    y_label='价格'
+    y_label=text_lang('价格',"Price")
     import datetime; today = datetime.date.today()
-    x_label="数据来源：综合新浪/东方财富/stooq/雅虎财经，"+str(today)
+    x_label=text_lang("数据来源：综合新浪/东方财富/stooq/雅虎财经，","Data source: Sina/EM/Stooq/Yahoo, ")+str(today)
 
     axhline_value=0
     axhline_label=''
-    title_txt="证券价格趋势分析："+ticker_name(ticker,ticker_type)+"，布林带"         
+    title_txt=text_lang("证券价格趋势分析：","Security Trend: ")+ticker_name(ticker,ticker_type)+text_lang("，布林带",", Bollinger Band")         
     
     """
         draw_lines(df1,y_label,x_label,axhline_value,axhline_label,title_txt, \
@@ -2267,7 +2267,7 @@ def security_bollinger(ticker,fromdate,todate,boll_days=20, \
                data_label=False,resample_freq='6H',smooth=smooth, \
                date_range=date_range,date_freq=date_freq,date_fmt='%Y-%m-%d', \
                colorlist=colorlist,lslist=lslist,lwlist=lwlist, \
-               band_area=['上(压力)线','下(支撑)线'],mark_end=mark_end,loc=loc)
+               band_area=[text_lang('上(压力)线','Upper Line'),text_lang('下(支撑)线','Lower Line')],mark_end=mark_end,loc=loc)
 
     return df1
 

siat/translate.py

@@ -1966,19 +1966,24 @@ def codetranslate1(code):
         ['000012.SS','SSE T-Bond Index'],['000013.SS','SSE Ent Bond Index'],
         ['000022.SS','SSE Corpbond Index'],['000061.SS','SSE Entbond30 Index'],
         ['000116.SS','SSE Creditbond100 Index'],['000101.SS','SSE 5-year Creditbond Index'],
+        
+        ['002594.SZ','BYD Auto (A)'],['01211.HK','BYD Auto (HK)'],['81211.HK','BYD Auto (HK RMB)'],
+        ['600941.SS','China Mobile'],['00941.HK','China Mobile (HK)'],['80941.HK','China Mobile (HK RMB)'],
+        ['ULVR.UK','Unilever (UK)'],['605011.SS','Hangzou Power'],['000723.SZ','Meijin Energy'],
 
         ['^GSPC','S&P500 Index'],['^DJI','Dow Jones Index'],
         ['WISGP.SI','FTSE Singapore Index'], ['^STI','Straits Times Index'],
         ['^IXIC','Nasdaq Composite Index'],['^FTSE','FTSE 100 Index'],
         ['^N100','Euronext 100 Index'],['^FMIB','FTSE Italy Index'],
         ['^TSX','Toronto Composite Index'],['^MXX','Mexico IPC Index'],
+        ['^SNX','India SENSEX 30 Index'],['^FTM','UK FTSE 250 Index'],
         
         ['FVTT.FGI','FTSE Viernam Index'],['^RUT','Russell 2000 Index'],
         ['^HSI','Hang Seng Index'],['^N225','Nikkei 225 Index'],
         ['WIKOR.FGI','FTSE Korea Index'],['^KS11','Korea Composite Index'],
         ['^KOSPI','Korea Composite Index'],['^BSESN','SENSEX Index'],
-        ['^FCHI','CAC40 Index'],['^GDAXI','DAX30 Index'], 
-        ['^CAC','CAC40 Index'],['^DAX','DAX30 Index'], 
+        ['^FCHI','France CAC40 Index'],['^GDAXI','Germany DAX30 Index'], 
+        ['^CAC','France CAC40 Index'],['^DAX','Germany DAX30 Index'], 
         ['IMOEX.ME','MOEX Index'],['^MOEX','MOEX Index'], 
         ['^RTS','RTS(USD) Index'],
         ['^VIX','VIX Index'],['ASEA','FTSE SE Asia ETF'],['LIT','Global X Lithium & Battery Tech ETF'],

{siat-3.2.37.dist-info → siat-3.2.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.2.37
+Version: 3.2.45
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University
@@ -32,6 +32,7 @@ Requires-Dist: graphviz
 Requires-Dist: luddite
 Requires-Dist: pendulum
 Requires-Dist: itables
+Requires-Dist: py-trans
 
 # Welcome to the Magic World of siat
 

{siat-3.2.37.dist-info → siat-3.2.45.dist-info}/RECORD

@@ -18,7 +18,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=07y3q4nJdkM-anpZepj4gK0gvTKj-BB0ppDDI5-TCcY,26904
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=AaZYKbkeLYYRdsncZ3HDhTM6d0RSJbJX7nid6U6TMfo,147084
+siat/common.py,sha256=_PkuAzT9fNJazC1p3NIQDqLduzfBFcLsV3KPteo377I,149963
 siat/compare_cross.py,sha256=3iP9TH2h3w27F2ARZc7FjKcErYCzWRc-TPiymOyoVtw,24171
 siat/compare_cross_test.py,sha256=xra5XYmQGEtfIZL2h-GssdH2hLdFIhG3eoCrkDrL3gY,3473
 siat/concepts_iwencai.py,sha256=m1YEDtECRT6FqtzlKm91pt2I9d3Z_XoP59BtWdRdu8I,3061
@@ -60,13 +60,13 @@ siat/future_china.py,sha256=F-HsIf2Op8Z22RzTjet1g8COzldgnMjFNSXsAkeGyWo,17595
 siat/future_china_test.py,sha256=BrSzmDVaOHki6rntOtosmRn-6dkfOBuLulJNqh7MOpc,1163
 siat/global_index_test.py,sha256=hnFp3wqqzzL-kAP8mgxDZ54Bd5Ijf6ENi5YJlGBgcXw,2402
 siat/google_authenticator.py,sha256=ZUbZR8OW0IAKDbcYtlqGqIpZdERpFor9NccFELxg9yI,1637
-siat/grafix.py,sha256=yPWr1rqb8yJjEs2zSJ5LMGl0TeSg2G_GID_QF6clysI,86432
+siat/grafix.py,sha256=W5I4IdOm9q7CdDHFSv6xFmfk9sPZXItXC4cCvp2q6mU,87137
 siat/grafix_test.py,sha256=kXvcpLgQNO7wd30g_bWljLj5UH7bIVI0_dUtXbfiKR0,3150
 siat/holding_risk.py,sha256=G3wpaewAKF9CwEqRpr4khyuDu9SU2EGyQUHdk7cmHOA,30693
 siat/holding_risk_test.py,sha256=FRlw_9wFG98BYcg_cSj95HX5WZ1TvkGaOUdXD7-V86s,474
 siat/local_debug_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
-siat/luchy_draw.py,sha256=27YTkFPr91D_ndNbmoxeUUcsjbfGWoufKP1FcF1lCkY,20379
-siat/market_china.py,sha256=hKoTLUyHuzsuG2L3_IuLx_utTKqS-__mZ63wrElh65U,45943
+siat/luchy_draw.py,sha256=CESMhLYcsC6UtYfTZOfYnVQ84zz1MnXRN81P7OZHEgE,20516
+siat/market_china.py,sha256=EOO-RvdnzJThTrgNHWW3TlWhx4k4rfdjbooOnQsYdQU,50299
 siat/markowitz.py,sha256=glHikhabFAF6Hb6df1pYfhkxid2IZXBYAVQng5wd9Wk,97526
 siat/markowitz2-20240620.py,sha256=irZAPnjaatFsKQmFRMENP-cO6bEUl2narYtkU5NKTWI,108019
 siat/markowitz2.py,sha256=csHIjqTbIsHMYQ_LEur9K0Jg8pOm8deEVdQfAGCOG5o,111461
@@ -102,10 +102,10 @@ siat/security_prices.py,sha256=ChiVcubRiPzUvYm8a5X5qjxWtawRQdYHFQXLIevGFC4,10532
 siat/security_prices_test.py,sha256=OEphoJ87NPKoNow1QA8EU_5MUYrJF-qKoWKNapVfZNI,10779
 siat/security_trend.py,sha256=o0vpWdrJkmODCP94X-Bvn-w7efHhj9HpUYBHtLl55D0,17240
 siat/security_trend2-20240620.py,sha256=QVnEcb7AyVbO77jVqfFsJffGXrX8pgJ9xCfoAKmWBPk,24854
-siat/security_trend2.py,sha256=5U1yZBqwRq0YX5BpmHij-7QFz7inIbWCq5kS9JSVY04,25284
+siat/security_trend2.py,sha256=WOygSyWSynNmk5gpOA8n1738-nWqfDzuyMjwriB3eP4,25284
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=TLiHaBBpqfE2S-Q4QrzBaj-uWEh5Zu17GAYYIDZlMCI,143322
+siat/stock.py,sha256=lk3Cvbm2ieFk-ISoy2nX0rEoqnnAGuX3lNiT6iskTjg,143914
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=zyUyghIrkkkYWlHRRP7Hoblxzfp-jrck60pTJpwMahg,91553
@@ -117,7 +117,7 @@ siat/stock_prices_kneighbors.py,sha256=WfZvo5EyeBsm-T37zDj7Sl9dPSRq5Bx4JxIJ9IUum
 siat/stock_prices_linear.py,sha256=-OUKRr27L2aStQgJSlJOrJ4gay_G7P-m-7t7cU2Yoqk,13991
 siat/stock_profile.py,sha256=B3eIwzEmiCqiCaxIlhfdEPsQBoW1PFOe1hkiY3mVF6Y,26038
 siat/stock_technical-20240620.py,sha256=A4x18mZgYSA8SSiDz4u_O3gd5oVRgbI6JIiBfFY0tVw,116013
-siat/stock_technical.py,sha256=GPedxbOSPTi8zthDMu69edFVLES2RSNor2a1y8Zo42w,131612
+siat/stock_technical.py,sha256=qhXOsZ9gowLtWviMgpTPjIfkgIfDWSRXVPZq4mYL5kM,133336
 siat/stock_test.py,sha256=E9YJAvOw1VEGJSDI4IZuEjl0tGoisOIlN-g9UqA_IZE,19475
 siat/stooq.py,sha256=dOc_S5HLrYg48YAKTCs1eX8UTJOOkPM8qLL2KupqlLY,2470
 siat/temp.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
@@ -131,14 +131,14 @@ siat/transaction_test.py,sha256=Z8g1LJCN4-mnUByXMUMoFmN0t105cbmsz2QmvSuIkbU,1858
 siat/translate-20230125.py,sha256=NPPSXhT38s5t9fzMvl_fvi4ckSB73ThLmZetVI-xGdU,117953
 siat/translate-20230206.py,sha256=-vtI125WyaJhmPotOpDAmclt_XnYVaWU9ByLWZ6FyYE,118133
 siat/translate-20230215.py,sha256=TJgtPE3n8IjljmZ4Pefy8dmHoNdFF-1zpML6BhA9FKE,121657
-siat/translate.py,sha256=dO9SZjlRTSc8dInr0VYoBVywGYX70Bk-cfBgZjHLIhc,215736
+siat/translate.py,sha256=YoC7OzzGUxT-7EEIU-GYWz0A9CBQ4aIQjlparfVJYSQ,216156
 siat/translate_20240606.py,sha256=63IyHWEU3Uz9mjwyuAX3fqY4nUMdwh0ICQAgmgPXP7Y,215121
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
 siat/valuation.py,sha256=NKfeZMdDJOW42oLVHob6eSVBXUqlN1OCnnzwyGAst8c,48855
 siat/valuation_china.py,sha256=EkZQaVkoBjM0c4MCNbaX-bMnlG0e3FXeaWczZDnkptU,67784
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
-siat-3.2.37.dist-info/METADATA,sha256=UnwG90_i5hNJUS3gc7fHwrxRs2EJZJaZHqExVTLJgR0,7258
-siat-3.2.37.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.2.37.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.2.37.dist-info/RECORD,,
+siat-3.2.45.dist-info/METADATA,sha256=a1zRvc3eoGiRhfDYBCgHd6iE9YgNmlj83jV1Alrq7Cc,7283
+siat-3.2.45.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.2.45.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.2.45.dist-info/RECORD,,